From owner-freebsd-questions  Thu Oct 18 16:41:12 2001
Delivered-To: freebsd-questions@freebsd.org
Received: from mailsrv.otenet.gr (mailsrv.otenet.gr [195.170.0.5])
	by hub.freebsd.org (Postfix) with ESMTP id 566F837B405
	for <freebsd-questions@FreeBSD.ORG>; Thu, 18 Oct 2001 16:41:09 -0700 (PDT)
Received: from hades.hell.gr (patr530-a125.otenet.gr [212.205.215.125])
	by mailsrv.otenet.gr (8.11.5/8.11.5) with ESMTP id f9INf4O19469;
	Fri, 19 Oct 2001 02:41:04 +0300 (EEST)
Received: (from charon@localhost)
	by hades.hell.gr (8.11.6/8.11.6) id f9IMHbL11005;
	Fri, 19 Oct 2001 01:17:37 +0300 (EEST)
	(envelope-from charon@labs.gr)
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>
References: <20011017150223.A373@blossom.cjclark.org> <XFMail.20011018081044.mj@isy.liu.se>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <XFMail.20011018081044.mj@isy.liu.se>
User-Agent: Mutt/1.3.22.1i
X-GPG-Fingerprint: C1EB 0653 DB8B A557 3829  00F9 D60F 941A 3186 03B6
X-URL: http://labs.gr/~charon/
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-questions.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-questions>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-questions>
X-Loop: FreeBSD.ORG

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