Re: Rebasing stgit stacks

From: Yann Dirson <ydirson@altern.org>
Date: Jan 24, 2007, 00:05 UTC
Message-ID: <20070124000551.GC4083@nan92-1-81-57-214-146.fbx.proxad.net>
In-Reply-To: <b0943d9e0701231403qefb28f0h91d3f599699b9908@mail.gmail.com>

On Tue, Jan 23, 2007 at 10:03:26PM +0000, Catalin Marinas wrote:

Show 7 quoted lines

> >I'll have to think more about that - I'm not sure I get you point.  By
> >moving/cloning we keep (or could keep) the patches' history.  By
> >importing we cannot do that.
> 
> The 'pick' command could be (easily) fixed to preserve the history of
> a patch (I'll add this to the todo list). The log commit would have
> the picked patch's log as a parent rather than none.

Right - "branch --clone" could also use that (or maybe it does already by design). Together with this, "pick --fold" and possibly "sync" (although I never used the latter so I'm not 100% sure how it works) could register a merge, and sometime in the future we could use this information to be able to do some merging. I'm not going to look into this soon, but I have this popping out regularly in my head ;)

> As I said, I'll first like to get a 1.0 out this spring.

Yes. Maybe we should get 0.12 out of the door soon, with some more bugs fixed. I'm trying to finish putting out in a decent shape stuff about parent branches, git-fetch use and the other related issues mentionned those last days. Maybe that will be ready before enough bugs are squashed for 0.12, but maybe not :)

Best regards,

-- 
yann.