tests/test-pull-update
author Shun-ichi GOTO <shunichi.goto@gmail.com>
Wed, 09 Jan 2008 21:30:35 +0900
changeset 5843 83c354c4d529
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
Add endswithsep() and use it instead of using os.sep and os.altsep directly. This change is intended to allow hooking endswithsep() by win32mbcs extension for MBCS support.

#!/bin/sh
#

hg init t
cd t
echo 1 > foo
hg ci -Am m

cd ..
hg clone t tt
cd tt
echo 1.1 > foo
hg ci -Am m

cd ../t
echo 1.2 > foo
hg ci -Am m
echo % should fail
hg pull -u ../tt

cd ../tt
echo % should fail
hg pull -u ../t
HGMERGE=true hg merge
hg ci -mm

cd ../t
echo % should work
hg pull -u ../tt