bug#59182: closed (28.1; ediff: Merges with ancestor: Fix computation of hunks and proposed merge)

[GNU bug Tracking System]

Your message dated Thu, 17 Nov 2022 11:41:53 +0200
with message-id <83cz9lex3y.fsf@gnu.org>
and subject line Re: bug#59182: Proposed fix
has caused the debbugs.gnu.org bug report #59182,
regarding 28.1; ediff: Merges with ancestor: Fix computation of hunks and 
proposed merge
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
59182: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59182
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

--- Begin Message --- Subject: 28.1; ediff: Merges with ancestor: Fix computation of hunks and proposed merge Date: Thu, 10 Nov 2022 19:29:09 +0100

Hunks are not computed correctly because the diff3 command is
invoked with arguments in an incorrect order.  The correct order is
the local file first, the base (or "ancestor") second and the other
file third. 

This erroneous behavior has two consequences.  First, the
output of diff3 would change, since it tries to merge chunks according
to maximal matches between the second and first files, and the second
and third files.  Second, ediff, more precisely, `ediff-do-merge',
would consequently try to merge the reverse of the changes from the
base to the other file, leading to a hard to understand merge result in
some cases.

To see the effect on a simple example, consider what
`ediff-merge-with-ancestors` suggests on the three files attached (run
`ediff-merge-with-ancestor' with file A being 'local.txt', file B being
'other.txt' and file C being 'ancestor.txt').

I noticed this problem on a very hairy merge that I can't reproduce here.

Fix to be attached as soon as the bug is created.

-- 
Olivier Certner

local.txt
Description: Text document

ancestor.txt
Description: Text document

other.txt
Description: Text document

--- End Message ---

> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#59182: Proposed fix
>
>
>
>
> Date: 
>
> Thu, 17 Nov 2022 11:41:53 +0200
>
>
>
>
> > From: Olivier Certner <ocert.dev@free.fr>
> > Date: Thu, 10 Nov 2022 19:35:28 +0100
> > 
> > On top of emacs-28 branch (49a14c4375ce4c2c).
> > 
> > The fix is "minimal", in the sense that it doesn't try to refactor/modify 
> > unrelated code.
>
> Thanks, I've now installed this on the master branch, and I'm closing
> the bug.
>
>
> --- End Message ---