merge: check current wc branch for 'nothing to merge', not its p1 The working directory will usually be clean or very clean, and wc will usually have the same branch as its parent. This change will thus usually not make any difference and is done as a separate change to show that. It will be used in a later change.

     1

@echo off

     2

rem Double-click this file to (re)build Mercurial for Windows in place.

     3

rem Useful for testing and development.

     4

cd ..\..

     5

del /Q mercurial\*.pyd

     6

del /Q mercurial\*.pyc

     7

rmdir /Q /S mercurial\locale

     8

python setup.py build_py -c -d . build_ext -i build_mo

     9

pause