GNU bug report logs - #24210
diff3 in diffutils 3.4 is broken

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Jim Meyering <jim <at> meyering.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#24210: closed (diff3 in diffutils 3.4 is broken)
Date: Mon, 15 Aug 2016 13:57:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Mon, 15 Aug 2016 06:56:02 -0700
with message-id <CA+8g5KEetCa27-7auBN4dA_VgLPY7nTJsOFscv-N0ow6VAE3_A <at> mail.gmail.com>
and subject line Re: [bug-diffutils] bug#24210: bug#24210: bug#24210: diff3 in diffutils 3.4 is broken
has caused the debbugs.gnu.org bug report #24210,
regarding diff3 in diffutils 3.4 is broken
to be marked as done.

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


-- 
24210: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=24210
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Bastian Beischer <bastian.beischer <at> rwth-aachen.de>
To: bug-diffutils <at> gnu.org
Subject: diff3 in diffutils 3.4 is broken
Date: Fri, 12 Aug 2016 16:22:00 +0200

Hello,

Please try to run diff3 from diffutils 3.4 as follows:

echo a > a.txt
echo b > b.txt
echo c > c.txt
diff3 a.txt b.txt c.txt

Expected output (with diff3 from diffutils 3.3):

====
1:1c
 a
2:1c
 b
3:1c
 c

Actual output (with diff3 from diffutils 3.4):

====3
1:1c
2:1c
 a
3:1c
 c

There was only one commit in src/diff3.c between 3.3 and 3.4:

http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id=3b74a905c5460e7979c53273ac90345860d001a7

Reverting this commit fixes the issue.

Best
Bastian

-- 
Bastian Beischer
RWTH Aachen University of Technology

@RWTH Aachen
Office: 28 C 203
Phone: +49-241-80-27205
E-mail: beischer <at> physik.rwth-aachen.de
Address: I. Physikalisches Institut B, Sommerfeldstr. 14, D-52074 Aachen

@CERN
Office: Bdg 32-4-B12
Phone: +41-22-76-75750
E-mail: bastian.beischer <at> cern.ch
Address: CERN, CH-1211 Geneve 23

[Message part 3 (message/rfc822, inline)]

From: Jim Meyering <jim <at> meyering.net>
To: Bastian Beischer <bastian.beischer <at> rwth-aachen.de>
Cc: 24210-done <at> debbugs.gnu.org
Subject: Re: [bug-diffutils] bug#24210: bug#24210: bug#24210: diff3 in
 diffutils 3.4 is broken
Date: Mon, 15 Aug 2016 06:56:02 -0700

On Sun, Aug 14, 2016 at 10:54 PM, Bastian Beischer
<bastian.beischer <at> rwth-aachen.de> wrote:
> The patches look fine to me, although I don't know the source of diff3 well
> enough to be a good reviewer. I've tested the patches a bit and everything
> seems to be OK. Thanks for fixing this issue.

Thanks for testing.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.