Mercurial > emacs

annotate .cvsignore @ 89970:a849e5779b8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--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).
author Miles Bader <miles@gnu.org>
date Sun, 05 Sep 2004 01:53:47 +0000
parents 32c007e23d05
children f0eb34e60705 d7ddb3e565de
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25839
Dave Love <fx@gnu.org>
parents:
diff changeset
1 configure
27634
6c9ee29e8955 * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents: 25839
diff changeset
2 bin
28195
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
3 boot.log
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
4 boot.log.diff
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
5 boot.log.old
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
6 update.log
31816
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
7 config.log
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
8 config.status
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
9 config.cache
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
10 Makefile
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
11 emacs*.tar.gz
35744
497c28f292c4 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 31816
diff changeset
12 leim*.tar.gz
497c28f292c4 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 31816
diff changeset
13 *.xdelta
44151
32c007e23d05 Whoops, that should be `autom4te.cache'
Miles Bader <miles@gnu.org>
parents: 44150
diff changeset
14 autom4te.cache