Re: Patch (apply) vs. Pull

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Jun 23, 2005, 12:10 UTC
Message-ID: <tnxr7et9su7.fsf@arm.com>
In-Reply-To: <Pine.LNX.4.21.0506230025420.30848-100000@iabervon.org>

Daniel Barkalow <barkalow@iabervon.org> wrote:

> I think that you'll get better results out of "merge with top" + "commit
> with old commit info, but not listing old commit as a parent". At least,
> that's what StGIT is doing, IIRC, and using merge instead of patch seems
> like it'll make the remaining 1% a lot more pleasant.

Actually StGIT still lists the old commit as the 2nd parent since I want to implement a log command which can also show only the commits against a single patch. If this 2nd parent would not be stored, pushing a patch onto the stack when its base was changed would reset all the history for that patch.

Of course, there are other ways of doing this like storing all the commit ids in a file but I found this to be the simplest.

-- 
Catalin