Re: Rebasing stgit stacks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jan 23, 2007 at 10:03:26PM +0000, Catalin Marinas wrote:
> >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.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]