135 src: 'a' -> dst: 'b' * |
135 src: 'a' -> dst: 'b' * |
136 checking for directory renames |
136 checking for directory renames |
137 resolving manifests |
137 resolving manifests |
138 branchmerge: True, force: True, partial: False |
138 branchmerge: True, force: True, partial: False |
139 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
139 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
|
140 preserving b for resolve of b |
140 b: local copied/moved from a -> m |
141 b: local copied/moved from a -> m |
141 preserving b for resolve of b |
|
142 updating: b 1/1 files (100.00%) |
142 updating: b 1/1 files (100.00%) |
143 picked tool 'internal:merge' for b (binary False symlink False) |
143 picked tool 'internal:merge' for b (binary False symlink False) |
144 merging b and a to b |
144 merging b and a to b |
145 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
145 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
146 premerge successful |
146 premerge successful |
149 searching for copies back to rev 1 |
149 searching for copies back to rev 1 |
150 resolving manifests |
150 resolving manifests |
151 branchmerge: True, force: True, partial: False |
151 branchmerge: True, force: True, partial: False |
152 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
152 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
153 e: remote is newer -> g |
153 e: remote is newer -> g |
154 b: keep -> k |
|
155 getting e |
154 getting e |
156 updating: e 1/1 files (100.00%) |
155 updating: e 1/1 files (100.00%) |
|
156 b: keep -> k |
157 e |
157 e |
158 grafting revision 4 |
158 grafting revision 4 |
159 searching for copies back to rev 1 |
159 searching for copies back to rev 1 |
160 resolving manifests |
160 resolving manifests |
161 branchmerge: True, force: True, partial: False |
161 branchmerge: True, force: True, partial: False |
162 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
162 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
|
163 preserving e for resolve of e |
163 d: remote is newer -> g |
164 d: remote is newer -> g |
|
165 getting d |
|
166 updating: d 1/2 files (50.00%) |
164 b: keep -> k |
167 b: keep -> k |
165 e: versions differ -> m |
168 e: versions differ -> m |
166 preserving e for resolve of e |
|
167 getting d |
|
168 updating: d 1/2 files (50.00%) |
|
169 updating: e 2/2 files (100.00%) |
169 updating: e 2/2 files (100.00%) |
170 picked tool 'internal:merge' for e (binary False symlink False) |
170 picked tool 'internal:merge' for e (binary False symlink False) |
171 merging e |
171 merging e |
172 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
172 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
173 warning: conflicts during merge. |
173 warning: conflicts during merge. |