166 branchmerge: True, force: True, partial: False |
166 branchmerge: True, force: True, partial: False |
167 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
167 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
168 e: remote is newer -> g |
168 e: remote is newer -> g |
169 getting e |
169 getting e |
170 updating: e 1/1 files (100.00%) |
170 updating: e 1/1 files (100.00%) |
171 b: keep -> k |
171 b: remote unchanged -> k |
172 e |
172 e |
173 grafting revision 4 |
173 grafting revision 4 |
174 searching for copies back to rev 1 |
174 searching for copies back to rev 1 |
175 resolving manifests |
175 resolving manifests |
176 branchmerge: True, force: True, partial: False |
176 branchmerge: True, force: True, partial: False |
177 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
177 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
178 preserving e for resolve of e |
178 preserving e for resolve of e |
179 d: remote is newer -> g |
179 d: remote is newer -> g |
180 getting d |
180 getting d |
181 updating: d 1/2 files (50.00%) |
181 updating: d 1/2 files (50.00%) |
182 b: keep -> k |
182 b: remote unchanged -> k |
183 e: versions differ -> m |
183 e: versions differ -> m |
184 updating: e 2/2 files (100.00%) |
184 updating: e 2/2 files (100.00%) |
185 picked tool 'internal:merge' for e (binary False symlink False) |
185 picked tool 'internal:merge' for e (binary False symlink False) |
186 merging e |
186 merging e |
187 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
187 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |