Mercurial > emacs
view BUGS @ 89970:a849e5779b8c
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 | 8ce686bd7f4f |
children | fb8bf24d2eb9 |
line wrap: on
line source
If you think you may have found a bug in GNU Emacs, please read the Bugs section of the Emacs manual for advice on (1) how to tell when to report a bug, and (2) how to write a useful bug report and what information it needs to have. There are three ways to read the Bugs section. (1) In a printed copy of the Emacs manual. You can order one from the Free Software Foundation; see the file etc/ORDERS. But if you don't have a copy on hand and you think you have found a bug, you shouldn't wait to get a printed manual; you should read the section right away as described below. (2) With Info. Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the Emacs manual, then m Bugs RET to get to the section on bugs. Or use standalone Info in a like manner. (Standalone Info is part of the Texinfo distribution, not part of the Emacs distribution.) (3) By hand. Do cat info/emacs* | more "+/^File: emacs, Node: Bugs," Please first check the file etc/PROBLEMS (e.g. with C-h C-e in Emacs) to make sure it isn't a known issue.