changeset 10504:d2c1fc440533 stable

test-merge-default: make content of test repo clearer.
Makes it easier to understand and modify the test.
(issue2043).

--- a/tests/test-merge-default	Thu Feb 18 20:47:12 2010 +0100
+++ b/tests/test-merge-default	Mon Feb 15 15:07:21 2010 -0500
@@ -4,18 +4,18 @@
 echo a > a
 hg commit -A -ma
 
-echo a >> a
+echo b >> a
 hg commit -mb
 
-echo a >> a
+echo c >> a
 hg commit -mc
 
 hg up 1
-echo a >> a
+echo d >> a
 hg commit -md
 
 hg up 1
-echo a >> a
+echo e >> a
 hg commit -me
 
 hg up 1
@@ -24,6 +24,7 @@
 
 hg up
 echo % should fail because \> 2 heads
+export HGMERGE=internal:other
 hg merge
 
 echo % should succeed
@@ -43,7 +44,7 @@
 hg merge
 
 hg up 3
-echo a >> a
+echo f >> a
 hg branch foobranch
 hg commit -mf
 echo % should fail because merge with other branch

--- a/tests/test-merge-default.out	Thu Feb 18 20:47:12 2010 +0100
+++ b/tests/test-merge-default.out	Mon Feb 15 15:07:21 2010 -0500
@@ -12,16 +12,16 @@
 abort: branch 'default' has 3 heads - please merge with an explicit rev
 (run 'hg heads .' to see heads)
 % should succeed
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should succeed - 2 heads
-changeset:   3:903c264cdf57
-parent:      1:ba677d0156c1
+changeset:   3:ea9ff125ff88
+parent:      1:1846eede8b68
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should fail because at tip
 abort: there is nothing to merge