152 resolving manifests |
152 resolving manifests |
153 branchmerge: True, force: True, partial: False |
153 branchmerge: True, force: True, partial: False |
154 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
154 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
155 preserving b for resolve of b |
155 preserving b for resolve of b |
156 b: local copied/moved from a -> m |
156 b: local copied/moved from a -> m |
157 updating: b 1/1 files (100.00%) |
|
158 picked tool 'internal:merge' for b (binary False symlink False) |
157 picked tool 'internal:merge' for b (binary False symlink False) |
159 merging b and a to b |
158 merging b and a to b |
160 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
159 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
161 premerge successful |
160 premerge successful |
162 committing files: |
161 committing files: |
168 resolving manifests |
167 resolving manifests |
169 branchmerge: True, force: True, partial: False |
168 branchmerge: True, force: True, partial: False |
170 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
169 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
171 e: remote is newer -> g |
170 e: remote is newer -> g |
172 getting e |
171 getting e |
173 updating: e 1/1 files (100.00%) |
|
174 b: remote unchanged -> k |
172 b: remote unchanged -> k |
175 committing files: |
173 committing files: |
176 e |
174 e |
177 committing manifest |
175 committing manifest |
178 committing changelog |
176 committing changelog |
182 branchmerge: True, force: True, partial: False |
180 branchmerge: True, force: True, partial: False |
183 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
181 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
184 preserving e for resolve of e |
182 preserving e for resolve of e |
185 d: remote is newer -> g |
183 d: remote is newer -> g |
186 getting d |
184 getting d |
187 updating: d 1/2 files (50.00%) |
|
188 b: remote unchanged -> k |
185 b: remote unchanged -> k |
189 e: versions differ -> m |
186 e: versions differ -> m |
190 updating: e 2/2 files (100.00%) |
|
191 picked tool 'internal:merge' for e (binary False symlink False) |
187 picked tool 'internal:merge' for e (binary False symlink False) |
192 merging e |
188 merging e |
193 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
189 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
194 warning: conflicts during merge. |
190 warning: conflicts during merge. |
195 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
191 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |