diff -r 94ad12aa0530 -r 4c94b6d0fb1c tests/test-issue619 --- a/tests/test-issue619 Thu Sep 02 22:17:22 2010 +0200 +++ b/tests/test-issue619 Thu Sep 02 23:22:51 2010 +0200 @@ -4,15 +4,15 @@ cd t hg init echo a > a -hg ci -Ama -d '1000000000 0' +hg ci -Ama echo b > b hg branch b -hg ci -Amb -d '1000000000 0' +hg ci -Amb hg co -C 0 echo fast-forward hg merge b -hg ci -Ammerge -d '1000000000 0' +hg ci -Ammerge echo bogus fast-forward should fail hg merge b