Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
authorPhil Cohen <phillco@fb.com>
Thu, 07 Dec 2017 13:20:47 -0800
changeset 35292 306a8604741f
parent 35291 aa660c1203a9
child 35293 8b3a636bb341
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts Differential Revision: https://phab.mercurial-scm.org/D1234
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Thu Dec 07 13:20:47 2017 -0800
+++ b/hgext/rebase.py	Thu Dec 07 13:20:47 2017 -0800
@@ -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:
Mercurial