31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
32 src: 'a' -> dst: 'b' * |
32 src: 'a' -> dst: 'b' * |
33 src: 'a2' -> dst: 'b2' ! |
33 src: 'a2' -> dst: 'b2' ! |
34 src: 'a2' -> dst: 'c2' ! |
34 src: 'a2' -> dst: 'c2' ! |
35 checking for directory renames |
35 checking for directory renames |
36 a2: divergent renames -> dr |
|
37 resolving manifests |
36 resolving manifests |
38 overwrite: False, partial: False |
37 overwrite: False, partial: False |
39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
40 a: remote moved to b -> m |
39 a: remote moved to b -> m |
|
40 preserving a for resolve of b |
|
41 a2: divergent renames -> dr |
41 b2: remote created -> g |
42 b2: remote created -> g |
42 preserving a for resolve of b |
|
43 removing a |
43 removing a |
44 updating: a 1/3 files (33.33%) |
44 updating: a 1/3 files (33.33%) |
45 picked tool 'internal:merge' for b (binary False symlink False) |
45 picked tool 'internal:merge' for b (binary False symlink False) |
46 merging a and b to b |
46 merging a and b to b |
47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
176 unmatched files in other: |
176 unmatched files in other: |
177 newfile |
177 newfile |
178 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
178 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
179 src: 'file' -> dst: 'newfile' % |
179 src: 'file' -> dst: 'newfile' % |
180 checking for directory renames |
180 checking for directory renames |
181 file: rename and delete -> rd |
|
182 resolving manifests |
181 resolving manifests |
183 overwrite: False, partial: False |
182 overwrite: False, partial: False |
184 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
183 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
|
184 file: rename and delete -> rd |
185 newfile: remote created -> g |
185 newfile: remote created -> g |
186 updating: file 1/2 files (50.00%) |
186 updating: file 1/2 files (50.00%) |
187 note: possible conflict - file was deleted and renamed to: |
187 note: possible conflict - file was deleted and renamed to: |
188 newfile |
188 newfile |
189 updating: newfile 2/2 files (100.00%) |
189 updating: newfile 2/2 files (100.00%) |