Mercurial > hg
comparison hgext/rebase.py @ 21832:4b93e19cd6e6
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 02 Jul 2014 00:01:13 -0500 |
parents | 3b40e32e88c3 2ba6c9b4e0eb |
children | 3646716b11a7 |
comparison
equal
deleted
inserted
replaced
21824:57c70d3ad1c9 | 21832:4b93e19cd6e6 |
---|---|
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 |