# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 1512681647 28800
# Node ID 306a8604741f21dc3d12bf2dbe4d29b0c01e5acb
# Parent  aa660c1203a9e10b679fa6deee2e0e943e97cc95
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

Differential Revision: https://phab.mercurial-scm.org/D1234

diff -r aa660c1203a9 -r 306a8604741f hgext/rebase.py
--- 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: