Mercurial > emacs
view nt/ftime.bat @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | 93ce5f375b46 |
children | 375f2633d815 ef719132ddfa |
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. prep /om /ft /sf _Fexecute_extended_command ..\src\obj\i386\pemacs rem ----------------------------------------------------------------- rem Use this version to ignore startup code rem 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: d1c629de-9172-4d72-ab68-9d45ab9903cc :skipArchTag