Mercurial > emacs
view nt/ftime-nostartup.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 | 68c22ea6027c |
children |
line wrap: on
line source
@echo off if (%1)==() echo Usage: %0 tracefile if (%1)==() goto done rem Need to fiddle with the dumped image so prep doesn't break it obj\i386\preprep ..\src\obj\i386\emacs.exe ..\src\obj\i386\pemacs.exe copy ..\src\obj\i386\temacs.map ..\src\obj\i386\pemacs.map rem ----------------------------------------------------------------- rem Use this version to profile explicit commands only. rem prep /om /ft /sf _Fexecute_extended_command ..\src\obj\i386\pemacs rem ----------------------------------------------------------------- rem Use this version to ignore startup code prep /om /ft /sf _command_loop_1 ..\src\obj\i386\pemacs rem ----------------------------------------------------------------- rem Use this version to include startup code rem prep /om /ft ..\src\obj\i386\pemacs rem ----------------------------------------------------------------- if errorlevel 1 goto done profile ..\src\obj\i386\pemacs %2 %3 %4 %5 %6 %7 %8 %9 if errorlevel 1 goto done prep /m ..\src\obj\i386\pemacs if errorlevel 1 goto done plist ..\src\obj\i386\pemacs > %1 :done goto skipArchTag arch-tag: 927c5199-a8a3-4cf0-ab56-62b66fc6520d :skipArchTag