Date: Fri, 19 Oct 2001 01:17:36 +0300 From: Giorgos Keramidas <charon@labs.gr> To: Micke Josefsson <mj@isy.liu.se> Cc: freebsd-questions@FreeBSD.ORG Subject: Re: Recursive diff? How? Message-ID: <20011019011736.A10901@hades.hell.gr> In-Reply-To: <XFMail.20011018081044.mj@isy.liu.se> References: <20011017150223.A373@blossom.cjclark.org> <XFMail.20011018081044.mj@isy.liu.se>
next in thread | previous in thread | raw e-mail | index | archive | help
Micke Josefsson <mj@isy.liu.se> wrote: > > The original situation arose from doing as in the snippet below. When I made the > diff with -crN however it actually did work. I still do not understand why diff > -r barfs. Because if you use diff with -r only, and you ommit any options that generate `context' in the diff output, the patch does not contain enough information for patch(1) to apply the patch. Try using the following two commands: % diff -r src.orig src > patch.diff and % diff -u -r src.orig src > patch-unified.diff and look closely to patch.diff and patch-unified.diff :-) The extra context and file information in patch-unified.diff are of a great importance to patch(1) when it tries to `apply' your diff to a source tree. -giorgos To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011019011736.A10901>