diff options
Diffstat (limited to 'tests/test-merge7.t')
| -rw-r--r-- | tests/test-merge7.t | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/tests/test-merge7.t b/tests/test-merge7.t index 10eed9a..9ae816b 100644 --- a/tests/test-merge7.t +++ b/tests/test-merge7.t @@ -45,7 +45,7 @@ now pull and merge from test-a $ hg merge merging test.txt warning: conflicts during merge. - merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') + merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] @@ -81,8 +81,8 @@ pull and merge from test-a again $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 + overwrite None partial False + ancestor 96b70246a118 local 50c3a7e29886+ remote 40d11a4173a8 test.txt: versions differ -> m preserving test.txt for resolve of test.txt updating: test.txt 1/1 files (100.00%) @@ -90,7 +90,7 @@ pull and merge from test-a again merging test.txt my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 warning: conflicts during merge. - merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') + merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] @@ -105,12 +105,12 @@ pull and merge from test-a again three $ hg debugindex test.txt - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) - 1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re) - 2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re) - 3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re) - 4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 7 0 0 01365c4cca56 000000000000 000000000000 + 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000 + 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 + 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557 + 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 $ hg log changeset: 4:40d11a4173a8 @@ -143,5 +143,3 @@ pull and merge from test-a again date: Thu Jan 01 00:00:00 1970 +0000 summary: Initial - - $ cd .. |