Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Mar 2000 17:43:56 +0200
From:      Giorgos Keramidas <keramida@ceid.upatras.gr>
To:        John Sconiers <jrs@enteract.com>
Cc:        freebsd-questions@FreeBSD.ORG
Subject:   Re: proper way to apply diff
Message-ID:  <20000321174356.C21349@hades.hell.gr>
In-Reply-To: <Pine.NEB.3.96.1000320152608.68256A-100000@shell-3.enteract.com>; from jrs@enteract.com on Mon, Mar 20, 2000 at 03:27:19PM -0600
References:  <Pine.NEB.3.96.1000320152608.68256A-100000@shell-3.enteract.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Mar 20, 2000 at 03:27:19PM -0600, John Sconiers wrote:

> What is the proper way (command) to apply a diff and recompile source?

Depending on how the diff was taken, you can most of the time get it to
work with:

	% cd /where/to/apply
	% patch -p0 < /path/to/patch.diff

If you're not sure the diff applies cleanly, and you suspect it might
fail to apply some hunks, then you can always add --check to the patch
options, and see what *would* happen, i.e.

	% cd /where/to/apply
	% patch -po --check < /path/to/patch.diff 2>&1 | more

Ciao,
- Giorgos Keramidas


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?20000321174356.C21349>