[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-commit] CVSROOT: /cvsroot/emacs
From: |
Miles Bader |
Subject: |
[Emacs-commit] CVSROOT: /cvsroot/emacs |
Date: |
Sun, 05 Sep 2004 09:38:46 -0400 |
Module name: emacs
Branch: emacs-unicode-2
Changes by: Miles Bader <address@hidden> 04/09/05 01:53:47
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: emacs-unicode-2
Changes by: Miles Bader <address@hidden> 04/09/05 01:53:47
Modified files:
leim : Makefile.in
lisp : makefile.w32-in
src : Makefile.in makefile.w32-in
Log message:
Revision: address@hidden/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).
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/leim/Makefile.in.diff?only_with_tag=emacs-unicode-2&tr1=1.55.4.6&tr2=1.55.4.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/makefile.w32-in.diff?only_with_tag=emacs-unicode-2&tr1=1.30.6.4&tr2=1.30.6.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/Makefile.in.diff?only_with_tag=emacs-unicode-2&tr1=1.279.2.5&tr2=1.279.2.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/makefile.w32-in.diff?only_with_tag=emacs-unicode-2&tr1=1.24.4.5&tr2=1.24.4.6&r1=text&r2=text
- [Emacs-commit] CVSROOT: /cvsroot/emacs, (continued)
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/04
- [Emacs-commit] CVSROOT: /cvsroot/emacs,
Miles Bader <=
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Kenichi Handa, 2004/09/09
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/09
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/09
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Kenichi Handa, 2004/09/12
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Kenichi Handa, 2004/09/13
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Kenichi Handa, 2004/09/14
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Kenichi Handa, 2004/09/14
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/15
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/15
- [Emacs-commit] CVSROOT: /cvsroot/emacs, Miles Bader, 2004/09/15