test-merge7.out
78 lines
| 2.4 KiB
| text/plain
|
TextLexer
/ tests / test-merge7.out
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1352 | pulling from ../test-a | ||
|
r1351 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r2019 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
|
r1351 | merge: warning: conflicts during merge | ||
merging test.txt | ||||
merging test.txt failed! | ||||
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
There are unresolved merges, you can redo the full merge using: | ||||
hg update -C 1 | ||||
hg merge 2 | ||||
|
r1352 | pulling from ../test-a | ||
|
r1351 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r2019 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
|
r1351 | merge: warning: conflicts during merge | ||
resolving manifests | ||||
|
r3110 | overwrite None branchmerge True partial False | ||
|
r2979 | ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 | ||
|
r1351 | test.txt versions differ, resolve | ||
merging test.txt | ||||
resolving test.txt | ||||
file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 | ||||
merging test.txt failed! | ||||
|
r1922 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r2175 | There are unresolved merges, you can redo the full merge using: | ||
hg update -C 3 | ||||
hg merge 4 | ||||
|
r1351 | one | ||
|
r1352 | <<<<<<< | ||
|
r1351 | two-point-five | ||
======= | ||||
two-point-one | ||||
|
r1352 | >>>>>>> | ||
|
r1351 | three | ||
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 | ||||
|
r1933 | changeset: 4:a070d41e8360 | ||
|
r1351 | tag: tip | ||
|
r1933 | parent: 2:faaea63e63a9 | ||
|
r1351 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1351 | summary: two -> two-point-one | ||
|
r1933 | changeset: 3:451c744aabcc | ||
parent: 1:e409be6afcc0 | ||||
parent: 2:faaea63e63a9 | ||||
|
r1351 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1351 | summary: Merge 1 | ||
|
r1933 | changeset: 2:faaea63e63a9 | ||
parent: 0:095c92b91f1a | ||||
|
r1351 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1351 | summary: Numbers as words | ||
|
r1933 | changeset: 1:e409be6afcc0 | ||
|
r1351 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1351 | summary: 2 -> 2.5 | ||
|
r1933 | changeset: 0:095c92b91f1a | ||
|
r1351 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1351 | summary: Initial | ||