Re: git rerere is confused with identical conflicts in multiple files

From: Markos Chandras <markos.chandras@imgtec.com>
Date: Jul 10, 2015, 15:21 UTC
Message-ID: <559FE310.5060204@imgtec.com>
In-Reply-To: <xmqqvbdsksmv.fsf@gitster.dls.corp.google.com>

Hi,

On 07/10/2015 03:13 PM, Junio C Hamano wrote:

Show 21 quoted lines

> Markos Chandras <Markos.Chandras@imgtec.com> writes:
> 
>> $ cat .git/MERGE_RR
>> 5563edc0fb427275a0ca5677c93c40def8b53258
>> arch/mips/include/asm/cpu-type.hf175ff6228f624296b661664bce4ab4e84d712cc
>>
>> arch/mips/include/asm/cpu.h5563edc0fb427275a0ca5677c93c40def8b53258
>>    arch/mips/kernel/idle.c5563edc0fb427275a0ca5677c93c40def8b53258
>> arch/mips/kernel/spram.c5563edc0fb427275a0ca5677c93c40def8b53258
>> arch/mips/kernel/traps.c5563edc0fb427275a0ca5677c93c40def8b53258
>> arch/mips/mm/c-r4k.c
>>
>> so as you see, multiple files share the same hash. That's probably
>> because the "conflicting context ( the part between >>> <<<<)" in every
>> file but cpu.h is identical and git seems to calculate the hash purely
>> on the conflicting context. That makes git rerere thinks that it only
>> has to resolve 2 conflicts instead of 6.
> 
> Yes, that is by design, and should not change.  The thing is, you do
> want to share the same resolution across files, regardless of the
> path, when the recorded resolution replays cleanly [*1*].

I see.

Show 30 quoted lines

> [...]
> 
> The thing to fix is "did it conflict, if so punt" step.  Within the
> same conflict ID, we would introduce the concept of "variant", and
> allow you to keep rr_cache/$ID/{preimage,postimage}.$variant.  The
> first part of the per MERGE_RR entry process would instead go like
> so:
> 
>     - Does rr-cache/$ID/ has one or more postimages?
>       - If so, for each variant, attempt three-way merge using
>         preimage, postimage and thisimage.
>       - Did one of the three-way merges replay cleanly?
>         - If so, be happy.
>         - If not, assign an unused variant to this path and change
>           its MERGE_RR entry from $ID to $ID.$variant
> 
>     - Does path still have conflicts?
>       - If not, record rr-cache/$ID/postimage for "variant".
> 
> The current "preimage", "postimage" will be kept as the first
> variant in rr-cache/$ID/ directory.  The second variant will likely
> be named (I don't have a code yet but have been slowly laying out
> the fundation to allow us to do this) "preimage.0" and "postimage.0",
> and the third one will have ".1" suffix.
> 
> This approach has the added benefit that existing rr-cache entries
> will stay valid (in addition to being able to replay the same
> resolution even after you renamed the path that conflict, unlike the
> case when you hashed the pathname together to break the conflict ID
> computtion).

I understand. Thanks for the explanation.

> 
> A WIP has been published on jc/rerere topic in my repository for the
> past few weeks, but I haven't reached the interesting "multi variant"
> part yet, as I said.

I am happy to test it when you have something more complete. If you can reply to this e-mail when the 'variant' patch finds its way into the master branch that would be great as well

-- 
markos