diff tests/test-copy-move-merge.t @ 12156:4c94b6d0fb1c

tests: remove unneeded -d flags

Many tests fixed the commit date of their changesets at '1000000 0' or
similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not
better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is
the default run-tests.py installs.

Removing the unnecessary flag removes some clutter and will hopefully
make it clearer what the tests are really trying to test. Some tests
did not even change their output when the dates were changed, in which
case the -d flag was truly irrelevant.

Dates used in sequence (such as '0 0', '1 0', etc...) were left alone
since they may make the test easier to understand.

--- 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)