Mercurial > emacs
view update-subdirs @ 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 | 68c22ea6027c |
children | f9a65d7ebd29 |
line wrap: on
line source
#!/bin/sh # Write into $1/subdirs.el a list of subdirs of directory $1. # Copyright (C) 1994,95,97,1999,2001,2004 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # # GNU Emacs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. cd $1 for file in *; do case $file in *.elc | *.el | term | RCS | CVS | Old | . | .. | =* | *~ | *.orig | *.rej) ;; *) if [ -d $file ]; then subdirs="\"$file\" $subdirs" fi ;; esac done if [ "x$subdirs" = x ]; then rm -f subdirs.el else echo ";; -*- no-byte-compile: t -*-" > subdirs.el echo ";; In load-path, after this directory should come ;; certain of its subdirectories. Here we specify them." >> subdirs.el echo "(normal-top-level-add-to-load-path '($subdirs)) ;; Local" "Variables: ;; version-control: never ;; no-byte-compile: t ;; End:" >> subdirs.el fi # arch-tag: 56ebcf1b-5c30-4934-b0b4-72d374064704