From owner-freebsd-questions Tue Mar 21 17:14:38 2000 Delivered-To: freebsd-questions@freebsd.org Received: from mail.hellasnet.gr (mail.hellasnet.gr [212.54.192.3]) by hub.freebsd.org (Postfix) with ESMTP id E015837BDD0 for ; Tue, 21 Mar 2000 17:14:33 -0800 (PST) (envelope-from keramida@ceid.upatras.gr) Received: from hades.hell.gr (ppp1.patr.hellasnet.gr [212.54.197.16]) by mail.hellasnet.gr (8.9.1/8.9.1) with ESMTP id DAA03736; Wed, 22 Mar 2000 03:13:24 +0200 (GMT) Received: (from charon@localhost) by hades.hell.gr (8.9.3/8.9.3) id RAA22864; Tue, 21 Mar 2000 17:43:57 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Date: Tue, 21 Mar 2000 17:43:56 +0200 From: Giorgos Keramidas To: John Sconiers Cc: freebsd-questions@FreeBSD.ORG Subject: Re: proper way to apply diff Message-ID: <20000321174356.C21349@hades.hell.gr> Reply-To: keramida@ceid.upatras.gr References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0i In-Reply-To: ; from jrs@enteract.com on Mon, Mar 20, 2000 at 03:27:19PM -0600 X-PGP-Fingerprint: 62 45 D1 C9 26 F9 95 06 D6 21 2A C8 8C 16 C0 8E Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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