34 src: 'a2' -> dst: 'c2' ! |
34 src: 'a2' -> dst: 'c2' ! |
35 checking for directory renames |
35 checking for directory renames |
36 resolving manifests |
36 resolving manifests |
37 branchmerge: True, force: False, partial: False |
37 branchmerge: True, force: False, partial: False |
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
|
39 preserving a for resolve of b |
|
40 removing a |
39 b2: remote created -> g |
41 b2: remote created -> g |
40 b: remote moved from a -> m |
|
41 preserving a for resolve of b |
|
42 a2: divergent renames -> dr |
|
43 removing a |
|
44 getting b2 |
42 getting b2 |
45 updating: b2 1/3 files (33.33%) |
43 updating: b2 1/3 files (33.33%) |
|
44 b: remote moved from a -> m |
46 updating: b 2/3 files (66.67%) |
45 updating: b 2/3 files (66.67%) |
47 picked tool 'internal:merge' for b (binary False symlink False) |
46 picked tool 'internal:merge' for b (binary False symlink False) |
48 merging a and b to b |
47 merging a and b to b |
49 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
48 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
50 premerge successful |
49 premerge successful |
|
50 a2: divergent renames -> dr |
51 updating: a2 3/3 files (100.00%) |
51 updating: a2 3/3 files (100.00%) |
52 note: possible conflict - a2 was renamed multiple times to: |
52 note: possible conflict - a2 was renamed multiple times to: |
53 c2 |
53 c2 |
54 b2 |
54 b2 |
55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
180 checking for directory renames |
180 checking for directory renames |
181 resolving manifests |
181 resolving manifests |
182 branchmerge: True, force: False, partial: False |
182 branchmerge: True, force: False, partial: False |
183 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
183 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
184 newfile: remote created -> g |
184 newfile: remote created -> g |
185 file: rename and delete -> rd |
|
186 getting newfile |
185 getting newfile |
187 updating: newfile 1/2 files (50.00%) |
186 updating: newfile 1/2 files (50.00%) |
|
187 file: rename and delete -> rd |
188 updating: file 2/2 files (100.00%) |
188 updating: file 2/2 files (100.00%) |
189 note: possible conflict - file was deleted and renamed to: |
189 note: possible conflict - file was deleted and renamed to: |
190 newfile |
190 newfile |
191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
192 (branch merge, don't forget to commit) |
192 (branch merge, don't forget to commit) |