##// END OF EJS Templates
CVS import: Support new-style .cvspass-file format....
CVS import: Support new-style .cvspass-file format. Based on an email from Ralf.Leibold at nuance dot com

File last commit:

r5080:73fdc8bd default
r5082:dc2e512c default
Show More
test-pull-update
29 lines | 301 B | text/plain | TextLexer
Thomas Arendsen Hein
Update on pull -u when heads were closed (fixes issue666)....
r5080 #!/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