--- a/tests/test-merge1 Mon Mar 13 12:22:55 2006 +0100
+++ b/tests/test-merge1 Mon Mar 13 13:05:41 2006 +0100
@@ -11,15 +11,15 @@
hg init
echo This is file a1 > a
hg add a
-hg commit -m "commit #0" -d "0 0"
+hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
-hg commit -m "commit #1" -d "0 0"
+hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
-hg commit -m "commit #2" -d "0 0"
+hg commit -m "commit #2" -d "1000000 0"
echo This is file b1 > b
echo %% no merges expected
env HGMERGE=../merge hg update -m 1
@@ -30,15 +30,15 @@
hg init
echo This is file a1 > a
hg add a
-hg commit -m "commit #0" -d "0 0"
+hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
-hg commit -m "commit #1" -d "0 0"
+hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
-hg commit -m "commit #2" -d "0 0"
+hg commit -m "commit #2" -d "1000000 0"
echo This is file b2 > b
echo %% merge should fail
env HGMERGE=../merge hg update -m 1
@@ -52,16 +52,16 @@
hg init
echo This is file a1 > a
hg add a
-hg commit -m "commit #0" -d "0 0"
+hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
-hg commit -m "commit #1" -d "0 0"
+hg commit -m "commit #1" -d "1000000 0"
echo This is file b22 > b
-hg commit -m "commit #2" -d "0 0"
+hg commit -m "commit #2" -d "1000000 0"
hg update 1
echo This is file c1 > c
hg add c
-hg commit -m "commit #3" -d "0 0"
+hg commit -m "commit #3" -d "1000000 0"
echo 'Contents of b should be "this is file b1"'
cat b
@@ -78,16 +78,16 @@
hg init
echo This is file a1 > a
hg add a
-hg commit -m "commit #0" -d "0 0"
+hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
-hg commit -m "commit #1" -d "0 0"
+hg commit -m "commit #1" -d "1000000 0"
echo This is file b22 > b
-hg commit -m "commit #2" -d "0 0"
+hg commit -m "commit #2" -d "1000000 0"
hg update 1
echo This is file c1 > c
hg add c
-hg commit -m "commit #3" -d "0 0"
+hg commit -m "commit #3" -d "1000000 0"
echo This is file b33 > b
echo %% merge of b should fail
env HGMERGE=../merge hg update -m 2