bug-gnu-utils
[Top][All Lists]
Advanced

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

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


From: Adrian Bunk
Subject: Bug#107293: diff cannot be patched without fuzz (fwd)
Date: Sat, 17 Nov 2001 14:57:16 +0100 (CET)

Hi Paul,

Mikael Hedin <address@hidden> reported the following problem:

<--  snip  -->

Hi, here are the files in question and a sample session, note the new
-2 option to diff.

/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$

<--  snip  -->

The sample files are attached.

cu
Adrian

-- 

Get my GPG key: finger address@hidden | gpg --import

Fingerprint: B29C E71E FE19 6755 5C8A  84D4 99FC EA98 4F12 B400

Attachment: usrguide-7.html.orig
Description: Text document

Next Chapter, Previous Chapter

Table of contents of this chapter, General table of contents

Top of the document, Beginning of this Chapter


reply via email to

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