diff -r 94ad12aa0530 -r 4c94b6d0fb1c tests/test-merge1.t --- a/tests/test-merge1.t Thu Sep 02 22:17:22 2010 +0200 +++ b/tests/test-merge1.t Thu Sep 02 23:22:51 2010 +0200 @@ -17,30 +17,30 @@ $ hg init $ echo This is file a1 > a $ hg add a - $ hg commit -m "commit #0" -d "1000000 0" + $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b - $ hg commit -m "commit #1" -d "1000000 0" + $ hg commit -m "commit #1" $ hg update 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo This is file c1 > c $ hg add c - $ hg commit -m "commit #2" -d "1000000 0" + $ hg commit -m "commit #2" created new head $ echo This is file b1 > b no merges expected $ hg merge -P 1 - changeset: 1:4ee19afe4659 + changeset: 1:b8bb4a988f25 user: test - date: Mon Jan 12 13:46:40 1970 +0000 + date: Thu Jan 01 00:00:00 1970 +0000 summary: commit #1 $ hg merge 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg diff --nodates - diff -r d9e5953b9dec b + diff -r 49035e18a8e6 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ @@ -54,16 +54,16 @@ $ hg init $ echo This is file a1 > a $ hg add a - $ hg commit -m "commit #0" -d "1000000 0" + $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b - $ hg commit -m "commit #1" -d "1000000 0" + $ hg commit -m "commit #1" $ hg update 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo This is file c1 > c $ hg add c - $ hg commit -m "commit #2" -d "1000000 0" + $ hg commit -m "commit #2" created new head $ echo This is file b2 > b merge should fail @@ -76,7 +76,7 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg diff --nodates - diff -r d9e5953b9dec b + diff -r 49035e18a8e6 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ @@ -90,17 +90,17 @@ $ hg init $ echo This is file a1 > a $ hg add a - $ hg commit -m "commit #0" -d "1000000 0" + $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b - $ hg commit -m "commit #1" -d "1000000 0" + $ hg commit -m "commit #1" $ echo This is file b22 > b - $ hg commit -m "commit #2" -d "1000000 0" + $ hg commit -m "commit #2" $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo This is file c1 > c $ hg add c - $ hg commit -m "commit #3" -d "1000000 0" + $ hg commit -m "commit #3" created new head Contents of b should be "this is file b1" @@ -117,7 +117,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg diff --nodates - diff -r c1dd73cbf59f b + diff -r 85de557015a8 b --- a/b +++ b/b @@ -1,1 +1,1 @@ @@ -132,17 +132,17 @@ $ hg init $ echo This is file a1 > a $ hg add a - $ hg commit -m "commit #0" -d "1000000 0" + $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b - $ hg commit -m "commit #1" -d "1000000 0" + $ hg commit -m "commit #1" $ echo This is file b22 > b - $ hg commit -m "commit #2" -d "1000000 0" + $ hg commit -m "commit #2" $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo This is file c1 > c $ hg add c - $ hg commit -m "commit #3" -d "1000000 0" + $ hg commit -m "commit #3" created new head $ echo This is file b33 > b merge of b should fail @@ -155,7 +155,7 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg diff --nodates - diff -r c1dd73cbf59f b + diff -r 85de557015a8 b --- a/b +++ b/b @@ -1,1 +1,1 @@