diff -r 94ad12aa0530 -r 4c94b6d0fb1c tests/test-filebranch --- a/tests/test-filebranch Thu Sep 02 22:17:22 2010 +0200 +++ b/tests/test-filebranch Thu Sep 02 23:22:51 2010 +0200 @@ -17,7 +17,7 @@ echo 1 > baz echo 1 > quux hg add foo bar baz quux -hg commit -m "base" -d "1000000 0" +hg commit -m "base" cd .. hg clone a b @@ -26,7 +26,7 @@ cd a echo 2a > foo echo 2a > bar -hg commit -m "branch a" -d "1000000 0" +hg commit -m "branch a" echo creating branch b @@ -34,7 +34,7 @@ cd b echo 2b > foo echo 2b > baz -hg commit -m "branch b" -d "1000000 0" +hg commit -m "branch b" echo "we shouldn't have anything but n state here" hg debugstate --nodates | grep -v "^n" @@ -50,7 +50,7 @@ echo "we shouldn't have anything but foo in merge state here" hg debugstate --nodates | grep "^m" -hg ci -m "merge" -d "1000000 0" +hg ci -m "merge" echo "main: we should have a merge here" hg debugindex .hg/store/00changelog.i