NOTICE: GNU Emacs merge scripts and repository uploaded
ben at 666.com
Sun Nov 7 23:31:53 EST 2004
See FTP subdir emacs-merge.
This directory contains some scripts to simplify synching files with GNU
A pre-created CVS repository is also available; it should be enough to run
cvs -d /usr/local/cvsroot init
if you haven't already created a CVS root, and then just untar the
repository under /usr/local/cvsroot, where it will go into the `emacs'
subdirectory. After that, use `make-merge' to create merge trees for the
various versions against which files in XEmacs have been synched in the
past. To synch up to the latest version of GNU Emacs, figure out the
version that the file was synched against (look at the "Synched up with"
message, but BEWARE that these may not be correct or may reflect incomplete
synching; if at all in doubt, do a diff against the corresponding
original). Then, copy the file into the appropriate directory in the
appropriate merge tree, and run `cvs update -A FILE', then fix up the
likely merge conflicts and copy the file back to where it belongs.
The repository contains tags for all the versions entered into it,
e.g. EMACS_19_34 or EMACS_21_3. You can do diffs between versions, e.g.
cvs diff -d EMACS_19_34 -d EMACS_21_3 subr.el
Note that the directory trees for the older versions have been rearranged
to match the newest version, to make it possible to compare files even
when the layout has changed.
Lists all the parameters you may want to set up.
Generates merge-#### directories under the currect directory,
for the various mergeable versions as listed in `emacs-config'.
Generates the scripts in `make-corr' that rearrange a version
to make it correspond to the most recent one.
Used by `make-make-corr'.
Run the generated make-corr-* scripts.
Combine the generation and running of the make-corr-* scripts.
Import the various modified versions into a CVS repository.
(Try to) generate the older 19.* versions by working backwards
from the patches. Requires the modified patches in `modpatches'
and doesn't work very well.
More information about the XEmacs-Beta