# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1543287387 -3600
# Node ID c8f96f4cb600b8854bea661cd2353e2ba919676c
# Parent  d5a2cc19903f97484ade8eabaaa2fef34e83969a# Parent  d2599da04bb5cc039cf161eb0e900cd4bc8de14c
branching: merge with stable

diff -r d5a2cc19903f -r c8f96f4cb600 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Mon Nov 26 16:43:39 2018 +0300
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Nov 27 03:56:27 2018 +0100
@@ -769,17 +769,18 @@
     returns the node of new commit which is formed
     """
     if orig.rev() == dest.rev():
-        raise error.Abort(_('tried to relocate a node on top of itself'),
-                          hint=_("This shouldn't happen. If you still "
-                                 "need to move changesets, please do so "
-                                 "manually with nothing to rebase - working "
-                                 "directory parent is also destination"))
+        msg = _('tried to relocate a node on top of itself')
+        hint = _("This shouldn't happen. If you still need to move changesets, "
+                 "please do so manually with nothing to rebase - working "
+                 "directory parent is also destination")
+        raise error.ProgrammingError(msg, hint=hint)
 
     if pctx is None:
         if len(orig.parents()) == 2:
-            raise error.Abort(_("tried to relocate a merge commit without "
-                                "specifying which parent should be moved"),
-                              hint=_("Specify the parent by passing in pctx"))
+            msg = _("tried to relocate a merge commit without specifying which "
+                    "parent should be moved")
+            hint = _("Specify the parent by passing in pctx")
+            raise error.ProgrammingError(msg, hint)
         pctx = orig.p1()
 
     commitmsg = orig.description()
@@ -1440,7 +1441,7 @@
          interrupted evolve
 
       - `hg evolve --stop`:
-         stops the current interrupted evolve,. keeping all the successful steps,
+         stops the current interrupted evolve, keeping all the successful steps,
          but delaying to resolution of the remaining step for later.
 
       - `hg evolve --abort`: