210 resolving manifests |
210 resolving manifests |
211 branchmerge: True, force: True, partial: False |
211 branchmerge: True, force: True, partial: False |
212 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
212 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
213 starting 4 threads for background file closing (?) |
213 starting 4 threads for background file closing (?) |
214 preserving b for resolve of b |
214 preserving b for resolve of b |
215 b: local copied/moved from a -> m (premerge) |
215 b: local copied/moved from a -> m |
216 picked tool ':merge' for b (binary False symlink False changedelete False) |
216 picked tool ':merge' for b (binary False symlink False changedelete False) |
217 merging b and a to b |
217 merging b and a to b |
218 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
218 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
219 premerge successful |
219 premerge successful |
220 committing files: |
220 committing files: |
240 branchmerge: True, force: True, partial: False |
240 branchmerge: True, force: True, partial: False |
241 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
241 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
242 d: remote is newer -> g |
242 d: remote is newer -> g |
243 getting d |
243 getting d |
244 preserving e for resolve of e |
244 preserving e for resolve of e |
245 e: versions differ -> m (premerge) |
245 e: versions differ -> m |
246 picked tool ':merge' for e (binary False symlink False changedelete False) |
246 picked tool ':merge' for e (binary False symlink False changedelete False) |
247 merging e |
247 merging e |
248 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 |
248 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 |
249 e: versions differ -> m (merge) |
|
250 picked tool ':merge' for e (binary False symlink False changedelete False) |
249 picked tool ':merge' for e (binary False symlink False changedelete False) |
251 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 |
250 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 |
252 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
251 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
253 abort: unresolved conflicts, can't continue |
252 abort: unresolved conflicts, can't continue |
254 (use 'hg resolve' and 'hg graft --continue') |
253 (use 'hg resolve' and 'hg graft --continue') |
853 skipping ungraftable merge revision 6 |
852 skipping ungraftable merge revision 6 |
854 [255] |
853 [255] |
855 $ hg graft -r 6 --base 5 |
854 $ hg graft -r 6 --base 5 |
856 grafting 6:25a2b029d3ae "6" |
855 grafting 6:25a2b029d3ae "6" |
857 merging d |
856 merging d |
|
857 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
858 merging e |
858 merging e |
859 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
860 abort: unresolved conflicts, can't continue |
859 abort: unresolved conflicts, can't continue |
861 (use 'hg resolve' and 'hg graft --continue') |
860 (use 'hg resolve' and 'hg graft --continue') |
862 [1] |
861 [1] |
863 $ echo a > d && hg resolve -qm |
862 $ echo a > d && hg resolve -qm |
864 continue: hg graft --continue |
863 continue: hg graft --continue |