D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Thu Dec 7 17:15:31 EST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG306a8604741f: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts (authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1234?vs=4199&id=4222
REVISION DETAIL
https://phab.mercurial-scm.org/D1234
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -483,9 +483,12 @@
stats = rebasenode(repo, rev, p1, base, self.state,
self.collapsef, dest)
if stats and stats[3] > 0:
- raise error.InterventionRequired(
- _('unresolved conflicts (see hg '
- 'resolve, then hg rebase --continue)'))
+ if self.wctx.isinmemory():
+ raise error.InMemoryMergeConflictsError()
+ else:
+ raise error.InterventionRequired(
+ _('unresolved conflicts (see hg '
+ 'resolve, then hg rebase --continue)'))
finally:
ui.setconfig('ui', 'forcemerge', '', 'rebase')
if not self.collapsef:
To: phillco, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list