Mercurial > public > mercurial-scm > hg-stable

diff mercurial/shelve.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 c93dd9d9f1e6
children 8c466bcb0879
line wrap: on
line diff
--- a/mercurial/shelve.py	Mon Jul 13 16:42:44 2020 -0700
+++ b/mercurial/shelve.py	Tue Jul 14 13:35:54 2020 -0700
@@ -1014,12 +1014,7 @@
                 activebookmark,
                 interactive,
             )
-            raise error.InterventionRequired(
-                _(
-                    b"unresolved conflicts (see 'hg resolve', then "
-                    b"'hg unshelve --continue')"
-                )
-            )
+            raise error.ConflictResolutionRequired(b'unshelve')
 
         with repo.dirstate.parentchange():
             repo.setparents(tmpwctx.node(), nodemod.nullid)