Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Path: utzoo!mnetor!seismo!columbia!rutgers!princeton!allegra!ulysses!mhuxt!ihnp4!chinet!steinmetz!sprite!montnaro
From: montnaro@sprite.UUCP
Newsgroups: comp.emacs
Subject: Re: How are diff files used to update the distribution ?
Message-ID: <1128@steinmetz.steinmetz.UUCP>
Date: Wed, 21-Jan-87 11:22:21 EST
Article-I.D.: steinmet.1128
Posted: Wed Jan 21 11:22:21 1987
Date-Received: Fri, 23-Jan-87 22:30:38 EST
References: <8701192041.AA01426@EDDIE.MIT.EDU>
Sender: root@steinmetz.steinmetz.UUCP
Reply-To: sprite!montnaro@steinmetz.UUCP (Skip Montanaro)
Organization: General Electric CRD, Schenectady, NY
Lines: 45
Keywords: patch, GNU Emacs updates

In article <8701192041.AA01426@EDDIE.MIT.EDU> SKAPUR@sbccmail.BITNET (Sanjay Kapur) writes:
>I copied version 18.33 of Gnu-emacs last month.
>I now also have the diff file diff-18.33-18.35.
>How can I use the diff file to update the 18.33 version to 18.35 ?

1. cd to the directory containing the GNU Emacs "dist" directory.

2. create the following symbolic links:

	ln -s dist dist-18.33
	ln -s dist dist-18.35

3. Check the beginning of diff-18.33-18.35 for any instructions. Create any
new files given (they will be at the beginning of the diff file). Trim the
instructions and any new files from the beginning of the diff file. You
don't strictly have to do this, but it speeds up patch's first patch
enormously.

4. execute

	patch -p < diff-18.33-18.35

Patch will spit out lots of messages. You will want to keep an eye on things
for "Hunk failed" messages. In particular, unless the constant emacs-version
in dist/lisp/version.el is "18.33.0" that particular patch will fail. No big
deal, just edit version.el and set emacs-version to "18.35.0".

Other failed hunks will turn up in whatever-file.type.rej (i.e.,
version.el.rej) for the previous example. If you have made local changes it
is possible that they will conflict with the distributed changes. At any
rate, you will have to compare the source file with the diff output in the
.rej file manually and figure out what the problem is. There are usually few
problems.

When a file is successfully patched, the original will be moved to
whatever-file.type.orig and the new one placed in whatever-file.type.

5. Remake emacs.


Skip Montanaro

ARPA: montanaro%desdemona.tcpip@ge-crd.arpa
UUCP: seismo!rochester!steinmetz!desdemona!montanaro
GE DECnet: csbvax::mrgate!montanaro@desdemona@smtp@tcpgateway