[procps] Re: procps changes
- From: Sami Kerola <kerolasa@xxxxxx>
- To: procps@xxxxxxxxxxxxx
- Date: Mon, 26 Sep 2011 20:34:43 +0200
On Mon, Sep 26, 2011 at 15:22, Jim Warner <james.warner@xxxxxxxxxxx> wrote:
> On Sep 26, 2011, at 7:31 AM, Craig Small wrote:
>
>> Last of all, any suggestions on the best way to merge Sami's
>> changes and the main procps tree? I could do a diff off them and
>> then patch it but I didn't know if there was a way of keeping
>> Sami's history in the main tree.
Add remote, fetch & merge. Isn't that the usual way?
git remote add sami git://gitorious.org/~kerolasa/procps/sami-procps-ng.git
git fetch sami
git merge sami/ng master
git push
profit
> I think there's a small oops in the autogen.sh script so don't try
> to merge just yet. I'm doing some more testing on Fedora, Suse and
> Mint and will advise shortly.
Is there? If yes the oops is very likely to be in util-linux as well,
after all I copied script almost as is.
> Also, I wonder if Sami might wish to integrate some/all of his
> 'style-fixes' too. He's put a lot of effort into that recently.
Depends when you want to release 3.3.0? I recommend to merge later.
Perhaps the 3.3.1 could be about well though helpful messages, and
gettext support.
BTW you can always trust me sending `git request-pull' when I think a
branch is ready for review. Activity without request is usually a
sign I have a patch set on mind, and that I'm not mad enough to keep
more than few hours worth of work on my laptop only; disk will break,
remote backups rock.
Notice also that numbers reported by gitorius are seemingly
misleading. It looks like yesterday I pushed 19 commits, which is is
not true. At Sunday I simply rebased patch set from June, and tried
to correct it to be more sensible (and I'm still not quite happy
about it).
> Here's what I've been doing locally and what might work on the real
> master under ssh. But I would try a test branch first.
> git pull git://gitorious.org/~kerolasa/procps/sami-procps-ng.git ng
?
> p.s. Sorry about the earlier 'distclean' business. I had no real
> appreciation for the black magic Sami has wrought with autotools.
> Nor have I any experience generating packages, just consuming 'em.
No worries. To me autotools is quite similar as sendmail; mostly
mysterious but works quite well if you do the same things, the same
way, as the guys who wrote the thing.
--
Sami Kerola
http://www.iki.fi/kerolasa/
Other related posts:
