Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert @ 1933:7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests.
Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on
all systems.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 13 Mar 2006 13:05:41 +0100 |
| parents | 9c918287d10b |
| children | 890e285c52a1 |
line wrap: on
line diff
--- a/tests/test-merge-revert +++ b/tests/test-merge-revert @@ -6,9 +6,9 @@ hg init echo "added file1" > file1 echo "added file2" > file2 hg add file1 file2 -hg commit -m "added file1 and file2" -d "0 0" -u user +hg commit -m "added file1 and file2" -d "1000000 0" -u user echo "changed file1" >> file1 -hg commit -m "changed file1" -d "0 0" -u user +hg commit -m "changed file1" -d "1000000 0" -u user hg -q log hg id hg update -C 0