Patchwork D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

login
register
mail settings
Submitter phabricator
Date Dec. 7, 2017, 9:44 p.m.
Message ID <286c78a72899bc4bb788f4d9b7629286@localhost.localdomain>
Download mbox | patch
Permalink /patch/26033/
State Not Applicable
Headers show

Comments

phabricator - Dec. 7, 2017, 9:44 p.m.
phillco updated this revision to Diff 4199.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1234?vs=4180&id=4199

REVISION DETAIL
  https://phab.mercurial-scm.org/D1234

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: phillco, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

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: