Mercurial > hg-stable
changeset 35301:306a8604741f
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
Differential Revision: https://phab.mercurial-scm.org/D1234
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Thu, 07 Dec 2017 13:20:47 -0800 |
| parents | aa660c1203a9 |
| children | 8b3a636bb341 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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: