diff tests/test-merge-commit @ 8167:6c82beaaa11a

tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default.
author Martin Geisler <mg@lazybytes.net>
date Sun, 26 Apr 2009 14:29:02 +0200
parents 46280c004f22
children 5b7da468531b
line wrap: on
line diff
--- a/tests/test-merge-commit	Sun Apr 26 11:49:17 2009 +0200
+++ b/tests/test-merge-commit	Sun Apr 26 14:29:02 2009 +0200
@@ -7,22 +7,22 @@
 
 echo line1 > foo
 hg add foo
-hg ci -m '0: add foo' -d '0 0'
+hg ci -m '0: add foo'
 
 echo line2 >> foo
-hg ci -m '1: change foo' -d '0 0'
+hg ci -m '1: change foo'
 
 hg up -C 0
 hg mv foo bar
 rm bar
 echo line0 > bar
 echo line1 >> bar
-hg ci -m '2: mv foo bar; change bar' -d '0 0'
+hg ci -m '2: mv foo bar; change bar'
 
 hg merge 1
 echo '% contents of bar should be line0 line1 line2'
 cat bar
-hg ci -m '3: merge with local rename' -d '0 0'
+hg ci -m '3: merge with local rename'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
@@ -31,14 +31,14 @@
 hg up -C 2
 rm bar
 echo line1 > bar
-hg ci -m '4: revert content change from rev 2' -d '0 0'
+hg ci -m '4: revert content change from rev 2'
 
 hg log --template '#rev#:#node|short# #parents#\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
-hg ci -m '5: merge' -d '0 0'
+hg ci -m '5: merge'
 hg debugindex .hg/store/data/bar.i
 
 
@@ -53,7 +53,7 @@
 hg merge 2
 echo '% contents of bar should be line0 line1 line2'
 cat bar
-hg ci -m '3: merge with remote rename' -d '0 0'
+hg ci -m '3: merge with remote rename'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
@@ -62,13 +62,13 @@
 hg up -C 2
 rm bar
 echo line1 > bar
-hg ci -m '4: revert content change from rev 2' -d '0 0'
+hg ci -m '4: revert content change from rev 2'
 
 hg log --template '#rev#:#node|short# #parents#\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
-hg ci -m '5: merge' -d '0 0'
+hg ci -m '5: merge'
 hg debugindex .hg/store/data/bar.i