Mercurial > hg
view tests/test-diff-change.out @ 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 | 9c6ae2e09e11 |
children |
line wrap: on
line source
invoking hg diff --nodates --change 1: diff -r 4bb65dda5db4 -r e9b286083166 file.txt --- a/file.txt +++ b/file.txt @@ -1,1 +1,1 @@ -first +second invoking hg diff --nodates --change e9b286083166: diff -r 4bb65dda5db4 -r e9b286083166 file.txt --- a/file.txt +++ b/file.txt @@ -1,1 +1,1 @@ -first +second invoking hg diff --nodates --change 6: diff -r e8a0797e73a6 -r aa9873050139 file.txt --- a/file.txt +++ b/file.txt @@ -6,6 +6,6 @@ 5 6 7 -8 +y 9 10 EOF