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

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

test-serve: wait before killing to always hide the "killed!" message....
test-serve: wait before killing to always hide the "killed!" message. Without the sleeps slower systems never display never display "killed!" while faster systems sometimes or nearly always display it.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5080:73fdc8bd default
r6000:8e7d6498 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