GNU bug report logs - #16848
diff reports a diff on identical lines

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Paul Eggert <eggert <at> cs.ucla.edu>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#16848: closed (diff reports a diff on identical lines)
Date: Mon, 24 Feb 2014 07:00:03 +0000

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

Your message dated Sun, 23 Feb 2014 22:59:40 -0800
with message-id <530AEDDC.3020708 <at> cs.ucla.edu>
and subject line Re: [bug-diffutils] bug#16848: diff reports a diff on identical lines
has caused the debbugs.gnu.org bug report #16848,
regarding diff reports a diff on identical lines
to be marked as done.

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


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

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

From: Vincent Lefevre <vincent <at> vinc17.net>
To: bug-diffutils <at> gnu.org
Subject: diff reports a diff on identical lines
Date: Sun, 23 Feb 2014 03:52:48 +0100

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

On some pair of files, "diff" reports a diff on identical lines.
See the attached archive. At line 1272 of "diff -u out1 out2":

@@ -137681,90 +138934,186 @@
 26659
 468
 462
-26946
+26946
+470
+814
+815
[...]

This chunk shouldn't contain:

-26946
+26946

There's the same problem without the "-u" option.

-- 
Vincent Lefèvre <vincent <at> vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

[bug.tar.xz (application/octet-stream, attachment)]

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

From: Paul Eggert <eggert <at> cs.ucla.edu>
To: Vincent Lefevre <vincent <at> vinc17.net>, 16848-done <at> debbugs.gnu.org
Cc: Gnulib bugs <bug-gnulib <at> gnu.org>
Subject: Re: [bug-diffutils] bug#16848: diff reports a diff on identical lines
Date: Sun, 23 Feb 2014 22:59:40 -0800

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

Thanks for the bug report.

I applied the attached three patches; the first is to gnulib and changes 
gnulib's diffseq module to handle that case better, the second is to 
diffutils and brings diffutils up to the latest gnulib, and the third is 
also to diffutils and makes diffutils compatible with the new gnulib in 
order to use the fix.  I'll CC: this to bug-gnulib.  The fix works for 
me so I'm marking this bug as fixed, but if it still doesn't work for 
you I can reopen it.

[diffseq.patch (text/plain, attachment)]

[0001-build-update-gnulib-submodule-to-latest.patch (text/plain, attachment)]

[0002-diff-remove-TOO_EXPENSIVE-heuristic.patch (text/plain, attachment)]

Previous Next

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