##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

diffstat: don't fail on merges...
diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5080:73fdc8bd default
r7664:3cc74ee7 default
Show More
test-pull-update
29 lines | 301 B | text/plain | TextLexer
/ tests / test-pull-update
History | Annotation | Raw |Copy content |Copy permalink
#!/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