Skip to content
Snippets Groups Projects
Commit 909cb9dd authored by Simon Heimberg's avatar Simon Heimberg
Browse files

histedit: always abort with same message when working dir is wrong.

Using only one message makes live easier for translators. The clearer
error message was supposed by Augie Fackler.
parent 3adbd57e
No related branches found
No related tags found
No related merge requests found
......@@ -583,7 +583,7 @@
if not newchildren:
# `parentctxnode` should match but no result. This means that
# currentnode is not a descendant from parentctxnode.
msg = _('working directory parent is not a descendant of %s')
msg = _('%s is not an ancestor of working directory')
hint = _('update to %s or descendant and run "hg histedit '
'--continue" again') % parentctx
raise util.Abort(msg % parentctx, hint=hint)
......
......@@ -73,7 +73,7 @@
$ hg up 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ HGEDITOR='echo foobaz > ' hg histedit --continue
abort: working directory parent is not a descendant of 055a42cdd887
abort: 055a42cdd887 is not an ancestor of working directory
(update to 055a42cdd887 or descendant and run "hg histedit --continue" again)
[255]
$ hg up 3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment