--- a/tests/test-copy-move-merge.t	Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-copy-move-merge.t	Thu Sep 02 23:22:51 2010 +0200
@@ -3,14 +3,14 @@
   $ hg init
 
   $ echo 1 > a
-  $ hg ci -qAm "first" -d "1000000 0"
+  $ hg ci -qAm "first"
 
   $ hg cp a b
   $ hg mv a c
   $ echo 2 >> b
   $ echo 2 >> c
 
-  $ hg ci -qAm "second" -d "1000000 0"
+  $ hg ci -qAm "second"
 
   $ hg co -C 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -18,7 +18,7 @@
   $ echo 0 > a
   $ echo 1 >> a
 
-  $ hg ci -qAm "other" -d "1000000 0"
+  $ hg ci -qAm "other"
 
   $ hg merge --debug
     searching for copies back to rev 1
@@ -31,7 +31,7 @@
     checking for directory renames
   resolving manifests
    overwrite None partial False
-   ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659
+   ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6
    a: remote moved to c -> m
    a: remote moved to b -> m
   preserving a for resolve of b
@@ -40,12 +40,12 @@
   updating: a 1/2 files (50.00%)
   picked tool 'internal:merge' for b (binary False symlink False)
   merging a and b to b
-  my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052
+  my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
   updating: a 2/2 files (100.00%)
   picked tool 'internal:merge' for c (binary False symlink False)
   merging a and c to c
-  my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052
+  my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)