Re: [RFC] Importing from a patch-oriented SCM

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Aug 19, 2005, 08:52 UTC
Message-ID: <46a038f905081901521296c24@mail.gmail.com>
In-Reply-To: <7vslx61i3s.fsf@assigned-by-dhcp.cox.net>

On 8/19/05, Junio C Hamano <junkio@cox.net> wrote:

Show 7 quoted lines

> Martin Langhoff <martin.langhoff@gmail.com> writes:
> 
> > If I remember correctly, Junio added some stuff in the merge & rebase
> > code that will identify if a particular patch has been seen and
> > applied, and skip it even if it's a bit out of order. But I don't know
> 
> I think you are talking about git-patch-id.

Is this used at commit time, and stored somewhere (doesn't seem to be) or do you select older patches from the destination branch at merge time?

If you only compare patches since the last merge, patches that were merged but somehow unreported will fall into a black hole and cause a conflict going forward anyway. Hmm. That seems to be a problem I won't be able to avoid if merges happen out-of-order.

I'll try and work out how it's being used during the merge (pointers/hints welcome) and see if I can do something smart w it. Thanks!

cheers,

martin