tests/test-pull-update
author Kirill Smelkov <kirr@landau.phys.spbu.ru>
Sat, 13 Oct 2007 15:25:11 +0400
changeset 5462 91a522a69c13
parent 5097 73fdc8bd3ed8
permissions -rwxr-xr-x
convert: svn -- fix tags handling They were simply not detected.

#!/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