--- a/tests/test-excessive-merge.t	Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-excessive-merge.t	Thu Sep 02 23:22:51 2010 +0200
@@ -4,72 +4,72 @@
   $ echo foo > b
   $ hg add a b
 
-  $ hg ci -m "test" -d "1000000 0"
+  $ hg ci -m "test"
 
   $ echo blah > a
 
-  $ hg ci -m "branch a" -d "1000000 0"
+  $ hg ci -m "branch a"
 
   $ hg co 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo blah > b
 
-  $ hg ci -m "branch b" -d "1000000 0"
+  $ hg ci -m "branch b"
   created new head
   $ HGMERGE=true hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
-  $ hg ci -m "merge b/a -> blah" -d "1000000 0"
+  $ hg ci -m "merge b/a -> blah"
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ HGMERGE=true hg merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
-  $ hg ci -m "merge a/b -> blah" -d "1000000 0"
+  $ hg ci -m "merge a/b -> blah"
   created new head
 
   $ hg log
-  changeset:   4:f6c172c6198c
+  changeset:   4:2ee31f665a86
   tag:         tip
-  parent:      1:448a8c5e42f1
-  parent:      2:7c5dc2e857f2
+  parent:      1:96155394af80
+  parent:      2:92cc4c306b19
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge a/b -> blah
   
-  changeset:   3:13d875a22764
-  parent:      2:7c5dc2e857f2
-  parent:      1:448a8c5e42f1
+  changeset:   3:e16a66a37edd
+  parent:      2:92cc4c306b19
+  parent:      1:96155394af80
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge b/a -> blah
   
-  changeset:   2:7c5dc2e857f2
-  parent:      0:dc1751ec2e9d
+  changeset:   2:92cc4c306b19
+  parent:      0:5e0375449e74
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch b
   
-  changeset:   1:448a8c5e42f1
+  changeset:   1:96155394af80
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch a
   
-  changeset:   0:dc1751ec2e9d
+  changeset:   0:5e0375449e74
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   $ hg debugindex .hg/store/00changelog.i
      rev    offset  length   base linkrev nodeid       p1           p2
-       0         0      64      0       0 dc1751ec2e9d 000000000000 000000000000
-       1        64      68      1       1 448a8c5e42f1 dc1751ec2e9d 000000000000
-       2       132      68      2       2 7c5dc2e857f2 dc1751ec2e9d 000000000000
-       3       200      75      3       3 13d875a22764 7c5dc2e857f2 448a8c5e42f1
-       4       275      29      3       4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2
+       0         0      60      0       0 5e0375449e74 000000000000 000000000000
+       1        60      62      1       1 96155394af80 5e0375449e74 000000000000
+       2       122      62      2       2 92cc4c306b19 5e0375449e74 000000000000
+       3       184      69      3       3 e16a66a37edd 92cc4c306b19 96155394af80
+       4       253      29      3       4 2ee31f665a86 96155394af80 92cc4c306b19
 
 revision 1
   $ hg manifest --debug 1