Mercurial > emacs
view nt/multi-install-info.bat @ 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 | 27bc8b966642 |
children | 23a17af379b1 |
line wrap: on
line source
@echo off rem Hack to run install-info with multiple info files on the command rem line on the Windows platform. rem rem Copyright (c) 2003 Free Software Foundation, Inc. rem rem This file is part of GNU Emacs. rem rem GNU Emacs is free software; you can redistribute it and/or modify rem it under the terms of the GNU General Public License as published by rem the Free Software Foundation; either version 2, or (at your option) rem any later version. rem rem GNU Emacs is distributed in the hope that it will be useful, rem but WITHOUT ANY WARRANTY; without even the implied warranty of rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the rem GNU General Public License for more details. rem rem You should have received a copy of the GNU General Public License rem along with GNU Emacs; see the file COPYING. If not, write to rem the Free Software Foundation, Inc., 59 Temple Place - Suite 330, rem Boston, MA 02111-1307, USA. rem rem rem Usage: rem multi-install-info <switch passed to install-info> FILE1 FILE2 ... rem rem By Peter 'Luna' Runestig <peter@runestig.com> 2003 set INSTALL_INFO=install-info set II_SWITCH=%1=%2 rem Eat the install-info switch: shift :Loop shift if .%1% == . goto EndLoop %INSTALL_INFO% %II_SWITCH% %1 goto Loop :EndLoop goto skipArchTag arch-tag: 4f590862-8ead-497a-a71c-fb4b0e5d50db :skipArchTag