view tests/test-add @ 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 a
cd a
echo a > a
hg add -n
hg st
hg add
hg st

echo b > b
hg add -n b
hg st
hg add b || echo "failed to add b"
hg st
echo % should fail
hg add b
hg st

hg ci -m 0
echo % should fail
hg add a

echo aa > a
hg ci -m 1
hg up 0
echo aaa > a
hg ci -m 2

hg merge
hg st
echo % should fail
hg add a
hg st
hg resolve -m a
hg ci -m merge

echo % issue683
hg rm a
hg st
echo a > a
hg add a
hg st

hg add c && echo "unexpected addition of missing file"
echo c > c
hg add d c && echo "unexpected addition of missing file"
hg st