Re: Bug#107293: diff cannot be patched without fuzz (fwd)

[Paul Eggert]

> From: Adrian Bunk <address@hidden>
> Date: Sat, 17 Nov 2001 14:57:16 +0100 (CET)
> 
> Mikael Hedin <address@hidden> reported the following problem:

> /tmp/micce$ ls -l
> totalt 8.0k
> -rw-rw-r--    1 micce    micce         305 aug  2 14:02 usrguide-7.html
> -rw-rw-r--    1 micce    micce         337 aug  2 14:02 usrguide-7.html.orig
> /tmp/micce$ diff -u usrguide-7.html.orig usrguide-7.html > diffff
> /tmp/micce$ patch -R --dry-run < diffff
> patching file usrguide-7.html
> Hunk #1 succeeded at 1 with fuzz 1.
> /tmp/micce$ diff -2u usrguide-7.html.orig usrguide-7.html > diffff
> /tmp/micce$ patch -R --dry-run < diffff
> patching file usrguide-7.html
> /tmp/micce$

I cannot reproduce this problem with diffutils test version 2.7.10
and with my private copy of 'patch' (2.5.4 plus some changes),
so perhaps the bug has been fixed already.

Here is the behavior that I get.  If you the same contents for
'diffff' that I do, then it is a 'patch' bug, not a 'diff' bug.


$ diff -u usrguide-7.html.orig usrguide-7.html >diffff
$ cat diffff
--- usrguide-7.html.orig        2002-03-12 21:14:44.125289317 -0800
+++ usrguide-7.html     2002-03-12 21:14:55.715214044 -0800
@@ -1,4 +1,4 @@
-<p><a href="usrguide-8.html"> Next </a> Chapter, <a href="usrguide-6.html"> 
Previous </a> Chapter</p><p>Table of contents of <a 
href="usrguide.html#toc7">this chapter</a>,
+<p>Next Chapter, <a href="usrguide-6.html"> Previous </a> Chapter</p><p>Table 
of contents of <a href="usrguide.html#toc7">this chapter</a>,
  General <a href="usrguide.html#toc">table of contents</a></p>
 <p><a href="usrguide.html"> Top </a> of the document,
  <a href="#0"> Beginning of this Chapter</a></p>
\ No newline at end of file
$ patch -R --dry-run <diffff
patching file usrguide-7.html
$ diff -U2 usrguide-7.html.orig usrguide-7.html > diffff
$ patch -R --dry-run <diffff
patching file usrguide-7.html
$