test-copy-move-merge.out
35 lines
| 965 B
| text/plain
|
TextLexer
/ tests / test-copy-move-merge.out
Matt Mackall
|
r5059 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||
| resolving manifests | ||||
| overwrite None partial False | ||||
| ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 | ||||
|
Matt Mackall
|
r5371 | searching for copies back to rev 1 | ||
| unmatched files in other: | ||||
| b | ||||
| c | ||||
| all copies found (* = to merge, ! = divergent): | ||||
| c -> a * | ||||
| b -> a * | ||||
| checking for directory renames | ||||
|
Matt Mackall
|
r5059 | a: remote moved to c -> m | ||
| a: remote moved to b -> m | ||||
|
Matt Mackall
|
r6512 | preserving a for resolve of b | ||
| preserving a for resolve of c | ||||
| removing a | ||||
| picked tool 'internal:merge' for b (binary False symlink False) | ||||
| merging a and b to b | ||||
| my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 | ||||
|
Matt Mackall
|
r6004 | premerge successful | ||
|
Matt Mackall
|
r6512 | picked tool 'internal:merge' for c (binary False symlink False) | ||
| merging a and c to c | ||||
| my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 | ||||
|
Matt Mackall
|
r6004 | premerge successful | ||
|
Matt Mackall
|
r5059 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
| -- b -- | ||||
| 0 | ||||
| 1 | ||||
| 2 | ||||
| -- c -- | ||||
| 0 | ||||
| 1 | ||||
| 2 | ||||