test-merge7.out
77 lines
| 2.5 KiB
| text/plain
|
TextLexer
/ tests / test-merge7.out
|
r6338 | updating working directory | ||
|
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) | ||
|
r6004 | merging test.txt | ||
|
r4365 | warning: conflicts during merge. | ||
|
r1351 | merging test.txt failed! | ||
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r9468 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | ||
|
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) | ||
|
r8753 | searching for copies back to rev 1 | ||
|
r1351 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 | ||||
|
r3121 | test.txt: versions differ -> m | ||
|
r6512 | preserving test.txt for resolve of test.txt | ||
|
r6004 | picked tool 'internal:merge' for test.txt (binary False symlink False) | ||
|
r1351 | merging test.txt | ||
|
r3314 | my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 | ||
|
r6004 | warning: conflicts during merge. | ||
|
r1351 | merging test.txt failed! | ||
|
r1922 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r9468 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | ||
|
r1351 | one | ||
|
r6004 | <<<<<<< local | ||
|
r1351 | two-point-five | ||
======= | ||||
two-point-one | ||||
|
r4387 | >>>>>>> other | ||
|
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 | ||