Mercurial > hg
view tests/test-586 @ 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.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | f1af59451c0c |
children |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A cd .. # a test for issue 1433, related to issue586 echo % create test repos hg init repoa touch repoa/a hg -R repoa ci -Am adda hg init repob touch repob/b hg -R repob ci -Am addb hg init repoc cd repoc hg pull ../repoa hg update mkdir tst hg mv * tst hg ci -m "import a in tst" hg pull -f ../repob echo % merge both repos hg merge mkdir src echo % move b content hg mv b src hg ci -m "import b in src" hg manifest