view tests/test-pull-update @ 8819:e93ab347c814

test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.

- factor out cvsci function (similar to other test-convert-cvs* scripts)
- add filterpath function (also similar to other scripts)
- generally munge the output of CVS
- add lots of output to make it easier to follow when things go wrong

This doesn't make the test pass reliably under CVS 1.11; it just makes
it behave the same as under CVS 1.12, i.e. sometimes it passes and
sometimes it fails.  Failure is more frequent with faster hardware.

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