On Sat, Feb 25, 2012 at 22:43, Craig Small <csmall-procps@xxxxxxxxxx> wrote: > On Sat, Feb 25, 2012 at 10:51:28AM +0100, Sami Kerola wrote: >> I did some of that last night, and pushed change to my git clone. Your >> and mine changes are in conflict. I'll >> >> https://gitorious.org/~kerolasa/procps/sami-procps-ng/commits/2012wk8 > > You're missing a word here: You'll <do something> to that push. > Create? Fix? Use? push? Harrass Craig to get included? not sure. Hi Craig, Me neither. Roughly at the time I sent the email my wife was babbling about something far more important than open source. Never the less, here's few patches including README change I mentioned. The second change in Gilles's README change is converted to separated patch. Before merging this remember that there are other pending pull requests. //www.freelists.org/post/procps/pull-fix-to-debian-bug-599556-and-bug55804467-correction //www.freelists.org/post/procps/PATCH-pmap-fix-const-warning,1 Plus two merge requests, one old and now from couple days ago that might have gone unnoticed by most of the people in this list. https://gitorious.org/procps/procps/merge_requests BTW who can control gitosis procps project? The front page information could be corrected so that the title would say procps-ng, and it could be time to throw the sourceforge link away. Secondly there should be a small note 'if you use web interface to submit merge request please announce them to mail list as well. See below mine (and some others) changes for this week in git pull format. -- -- -- -- -- The following changes since commit d9c226c6950c433973ee783004923a69bb88e816: Merge remote-tracking branch 'sami/2012wk6' (2012-02-12 21:56:05 +1100) are available in the git repository at: git://gitorious.org/~kerolasa/procps/sami-procps-ng.git 2012wk8 for you to fetch changes up to 7ceb4003c8597472024adf185ebc3479346a7b04: build-sys: fix typo (2012-02-26 00:58:43 +0100) ---------------------------------------------------------------- Gilles Espinasse (1): build-sys: fix typo Jaromir Capik (2): docs: typo in ps.1 manual [rpmlint] license: update FSF addresses Sami Kerola (14): docs: change README to describe procps-ng project docs: ask gitorious merge request announces docs: add how to contribute to README vmstat: fix compiler warnings pgrep: fix compiler warnings pwdx: fix compiler warning watch: remove unused variables build-sys: require compiler running in C99 mode c.h: fix macro definition warning libprocps: readproc: use proper uid and gid types w: use utmp definitions to determine array sizes w: fix compiler warnings pmap: fix compiler format warnings ps: fix compiler warnings COPYING | 43 +++++++++++++++-------------- COPYING.LIB | 18 ++++++------- Documentation/BUGS | 7 +++++ README | 76 +++++++++++++++++++--------------------------------- configure.ac | 19 ++++++++++++- include/c.h | 8 +++--- pgrep.c | 5 ++-- pmap.c | 10 +++---- proc/COPYING | 18 ++++++------- proc/readproc.h | 15 +++++++---- ps/COPYING | 20 +++++++------- ps/common.h | 4 +-- ps/global.c | 2 +- ps/output.c | 3 +-- ps/ps.1 | 2 +- pwdx.c | 12 ++++++--- top/top.1 | 2 +- vmstat.c | 18 ++++++------- w.c | 19 ++++++------- watch.c | 2 +- 20 files changed, 154 insertions(+), 149 deletions(-) -- Sami Kerola http://www.iki.fi/kerolasa/