Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/histedit.py
branchstable
changeset 19847 45c3086880c7
parent 19842 1aaefba2a3a9
child 19852 57479e0d203d 
--- a/hgext/histedit.py	Mon Sep 30 14:23:14 2013 +0200
+++ b/hgext/histedit.py	Tue Oct 01 00:35:07 2013 +0900
@@ -646,8 +646,7 @@
             # `parentctxnode` should match but no result. This means that
             # currentnode is not a descendant from parentctxnode.
             msg = _('%s is not an ancestor of working directory')
-            hint = _('update to %s or descendant and run "hg histedit '
-                     '--continue" again') % parentctx
+            hint = _('use "histedit --abort" to clear broken state')
             raise util.Abort(msg % parentctx, hint=hint)
         newchildren.pop(0)  # remove parentctxnode
     # Commit dirty working directory if necessary
hg-stable