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