Mercurial > hg

diff hgext/rebase.py @ 45151:e429e7c801b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: normalize "unresolved conflicts" error messages with a custom class Differential Revision: https://phab.mercurial-scm.org/D8713
author Daniel Ploch <dploch@google.com>
date Tue, 14 Jul 2020 13:35:54 -0700
parents dc5e5577af39
children 0ea08126a2af
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Jul 13 16:42:44 2020 -0700
+++ b/hgext/rebase.py	Tue Jul 14 13:35:54 2020 -0700
@@ -630,12 +630,7 @@
                         if self.inmemory:
                             raise error.InMemoryMergeConflictsError()
                         else:
-                            raise error.InterventionRequired(
-                                _(
-                                    b"unresolved conflicts (see 'hg "
-                                    b"resolve', then 'hg rebase --continue')"
-                                )
-                            )
+                            raise error.ConflictResolutionRequired(b'rebase')
             if not self.collapsef:
                 merging = p2 != nullrev
                 editform = cmdutil.mergeeditform(merging, b'rebase')