Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Path: utzoo!mnetor!uunet!husc6!linus!philabs!ttidca!mb
From: mb@ttidca.TTI.COM (Michael Bloom)
Newsgroups: comp.emacs
Subject: Re: Stupid(?) Question
Message-ID: <1391@ttidca.TTI.COM>
Date: Sat, 24-Oct-87 19:12:52 EST
Article-I.D.: ttidca.1391
Posted: Sat Oct 24 19:12:52 1987
Date-Received: Tue, 27-Oct-87 02:41:07 EST
References: <468@nysernic>
Reply-To: mb@ttidca.UUCP (The Mb of all Evil)
Organization: Citicorp/TTI, Santa Monica
Lines: 24
Keywords: GNU Emacs diffs
Summary: use patch(n)


 Christopher A. Welty writes:

>	This may seem like a silly question, but is there an easy way
>to update my GNU emacs src by using the diff files that are provided
>on prep?  

Yes! Use the "patch" program. Patch is one of the most wonderful
programs devised by man. It has been distributed through the net and
also comes on the user contributed portion of 4.3 bsd.  Grab a copy
from "/usr/src/new" on a 4.3 system. Also grab the manual page so I
can keep this followup brief.

Instructions:
	1) Pull out any new or replaced files from rms's diffs.
	2) say: "patch -p < DIFF_FILE"
	3) watch the output for any "patch failed" messages. These should
	   be rare.  If they happen, the portions of the diffs that
	   still have to be done by hand will be left in files named
	   <source_file_name>.rej

Patch understands several types of diffs, but context diffs seem to
allow patch to best recover by itself from discrepancies in the file
being patched.