emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debbugs-tracker] bug#16848: closed (diff reports a diff on identical li


From: GNU bug Tracking System
Subject: [debbugs-tracker] bug#16848: closed (diff reports a diff on identical lines)
Date: Mon, 24 Feb 2014 07:00:03 +0000

Your message dated Sun, 23 Feb 2014 22:59:40 -0800
with message-id <address@hidden>
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
address@hidden)


-- 
16848: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16848
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: diff reports a diff on identical lines Date: Sun, 23 Feb 2014 03:52:48 +0100 User-agent: Mutt/1.5.21-6305-vl-r59709 (2013-04-16)
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 <address@hidden> - 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)

Attachment: bug.tar.xz
Description: Binary data


--- End Message ---
--- Begin Message --- Subject: Re: [bug-diffutils] bug#16848: diff reports a diff on identical lines Date: Sun, 23 Feb 2014 22:59:40 -0800 User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0
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.

Attachment: diffseq.patch
Description: Text document

Attachment: 0001-build-update-gnulib-submodule-to-latest.patch
Description: Text document

Attachment: 0002-diff-remove-TOO_EXPENSIVE-heuristic.patch
Description: Text document


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]