From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Nov 2007 17:40:22 GMT
Subject: Re: [Discussion] cherry-picking a merge
Message-ID: <7vy7cz4dbt.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20071115081648.GK14735@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> writes:

> Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> When you think about it, as long as the topological relationship
>> between A and B is very similar to that of C and B (iow,
>> "merge-base A B" and "merge-base C B" are the same), the effect
>> should be the same as a real merge between B and C, shouldn't it?
>> 
>>   ---o---o---C---A---M
>>       \       \     /
>>        o---o---\---B
>>                 \   \
>>                  `---X
>> 
>> I am wondering if it makes sense to record the result of
>> "cherry-pick -m" as a real merge between the current HEAD and
>> all the other parents of the cherry-picked merge except the one
>> that is named with the <parent-number>.
>
> Yes.

Actually, this turns to be a trick question ;-)

If there was an accidental clean merge between A and B, and a
part of the duplicated same changes in the accidental clean
merge sits between C and A, replaying the difference from A to M
on top of C would not yield the same result as merging B into C.