tests/test-pull-update
author Wagner Bruna <wbruna@softwareexpress.com.br>
Tue, 09 Jun 2009 11:49:16 -0300
changeset 8757 f835b8a7eeed
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
i18n-pt_BR: synchronized and updated - synchronized with hg 6019e6517f95 - translated remaining messages - many spelling and formatting fixes

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