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

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

issue1577: fix broken test by assuming less about CVS output....
issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5080:73fdc8bd default
r8081:6c3b8132 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