Mercurial > public > mercurial-scm > hg
diff tests/test-merge3 @ 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 | 0902ffece4b4 |
| children | 6a64813276ed |
line wrap: on
line diff
--- a/tests/test-merge3 Mon Mar 13 12:22:55 2006 +0100 +++ b/tests/test-merge3 Mon Mar 13 13:05:41 2006 +0100 @@ -3,8 +3,8 @@ hg init echo This is file a1 > a hg add a -hg commit -m "commit #0" -d "0 0" +hg commit -m "commit #0" -d "1000000 0" touch b hg add b rm b -hg commit -A -m"comment #1" -d "0 0" +hg commit -A -m"comment #1" -d "1000000 0"