view admin/README @ 89970:a849e5779b8c

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-35 Fix damage caused by trunk merge in emacs--unicode--0--patch-15 Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed from tagline to explicit [because they were used as template files, and their syntax didn't accommodate stripping comments, so the the generated files caused id-tag conflicts when an in-tree build was done]. Unfortunately arch doesn't handle id-tag changes well, so this resulted in the files appearing to be deleted, and then added again. When that changeset was merged into the unicode branch, it resulted in unicode-specific changes being dropped, and the trunk version being added. To fix this, I restored these files to their pre-merge versions (from emacs--unicode--0--patch-14), and then manually reapplied all changes from: (1) the unicode branch from the bogus merge point to the current version (emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34) (2) the trunk from the bogus merge point to the latest version which was merged into the unicode branch (emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522) and fixed any conflicts (mostly due to doubly-applied patch hunks that patch couldn't detect).

This directory contains scripts and other things useful for developing
and maintaining Emacs.  These files are not part of Emacs releases
because they are not deemed generally useful, and you have to know
what you do when using them.

Brief description of scripts found here:

admin.el		utilities for setting version numbers and alike
alloc-color.c		a utility program that allocates a given number of
			colors on X.  Can be used to debug Emacs with
			dense colormaps (PseudoColor).
build-configs		build Emacs in various configurations
check-doc-strings	check doc strings against documentation
cus-test.el		tests for custom types and load problems
diff-tar-files		show files added/removed between two tar files
make-emacs		build Emacs in various ways
make-tarball.txt	instructions to create pretest or release tarballs
quick-install-emacs	install emacs quickly (`incrementally')
revdiff			get CVS diffs of files

Brief description of sub-directories:

charsets		scripts for generating charset map files
			in ../etc/charsets

# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463