diff tests/test-conflict.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-conflict.t	Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-conflict.t	Thu Sep 02 23:22:51 2010 +0200
@@ -1,13 +1,13 @@
   $ hg init
   $ echo "nothing" > a
   $ hg add a
-  $ hg commit -m ancestor -d "1000000 0"
+  $ hg commit -m ancestor
   $ echo "something" > a
-  $ hg commit -m branch1 -d "1000000 0"
+  $ hg commit -m branch1
   $ hg co 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "something else" > a
-  $ hg commit -m branch2 -d "1000000 0"
+  $ hg commit -m branch2
   created new head
 
   $ hg merge 1
@@ -18,7 +18,7 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 
   $ hg id
-  e7fe8eb3e180+0d24b7662d3e+ tip
+  32e80765d7fe+75234512624c+ tip
 
   $ cat a
   <<<<<<< local