Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-filebranch @ 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 | 6f274afc05c7 |
children | e506c14382fd |
line wrap: on
line diff
--- a/tests/test-filebranch +++ b/tests/test-filebranch @@ -17,7 +17,7 @@ echo 1 > bar echo 1 > baz echo 1 > quux hg add foo bar baz quux -hg commit -m "base" -d "0 0" +hg commit -m "base" -d "1000000 0" cd .. hg clone a b @@ -26,7 +26,7 @@ echo creating branch a cd a echo 2a > foo echo 2a > bar -hg commit -m "branch a" -d "0 0" +hg commit -m "branch a" -d "1000000 0" echo creating branch b @@ -34,7 +34,7 @@ cd .. cd b echo 2b > foo echo 2b > baz -hg commit -m "branch b" -d "0 0" +hg commit -m "branch b" -d "1000000 0" echo "we shouldn't have anything but n state here" hg debugstate | cut -b 1-16,35- @@ -50,7 +50,7 @@ echo new > quux echo "we shouldn't have anything but foo in merge state here" hg debugstate | cut -b 1-16,35- | grep "^m" -hg ci -m "merge" -d "0 0" +hg ci -m "merge" -d "1000000 0" echo "main: we should have a merge here" hg debugindex .hg/00changelog.i