Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge7 @ 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 | bf6c91cb816f |
children | e506c14382fd |
line wrap: on
line diff
--- a/tests/test-merge7 +++ b/tests/test-merge7 @@ -9,7 +9,7 @@ 2 3 EOF hg add test.txt -hg commit -m "Initial" -d "0 0" +hg commit -m "Initial" -d "1000000 0" # clone cd .. @@ -22,7 +22,7 @@ one two three EOF -hg commit -m "Numbers as words" -d "0 0" +hg commit -m "Numbers as words" -d "1000000 0" # change test-b cd ../test-b @@ -31,7 +31,7 @@ 1 2.5 3 EOF -hg commit -m "2 -> 2.5" -d "0 0" +hg commit -m "2 -> 2.5" -d "1000000 0" # now pull and merge from test-a hg pull ../test-a @@ -43,7 +43,7 @@ two-point-five three EOF rm -f *.orig -hg commit -m "Merge 1" -d "0 0" +hg commit -m "Merge 1" -d "1000000 0" # change test-a again cd ../test-a @@ -52,7 +52,7 @@ one two-point-one three EOF -hg commit -m "two -> two-point-one" -d "0 0" +hg commit -m "two -> two-point-one" -d "1000000 0" # pull and merge from test-a again cd ../test-b