341 raise error.InterventionRequired( |
341 raise error.InterventionRequired( |
342 _('unresolved conflicts (see hg ' |
342 _('unresolved conflicts (see hg ' |
343 'resolve, then hg rebase --continue)')) |
343 'resolve, then hg rebase --continue)')) |
344 finally: |
344 finally: |
345 ui.setconfig('ui', 'forcemerge', '', 'rebase') |
345 ui.setconfig('ui', 'forcemerge', '', 'rebase') |
346 cmdutil.duplicatecopies(repo, rev, target) |
346 if collapsef: |
|
347 cmdutil.duplicatecopies(repo, rev, target) |
|
348 else: |
|
349 # If we're not using --collapse, we need to |
|
350 # duplicate copies between the revision we're |
|
351 # rebasing and its first parent, but *not* |
|
352 # duplicate any copies that have already been |
|
353 # performed in the destination. |
|
354 p1rev = repo[rev].p1().rev() |
|
355 cmdutil.duplicatecopies(repo, rev, p1rev, skiprev=target) |
347 if not collapsef: |
356 if not collapsef: |
348 newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn, |
357 newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn, |
349 editor=editor) |
358 editor=editor) |
350 else: |
359 else: |
351 # Skip commit if we are collapsing |
360 # Skip commit if we are collapsing |