Mercurial > hg

diff tests/test-histedit-edit.t @ 18609:909cb9ddba4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Simon Heimberg <simohe@besonet.ch>
date Sat, 03 Aug 2013 16:40:13 +0200
parents 358c23e8f1c6
children 79580b3140cd
line wrap: on
line diff
--- a/tests/test-histedit-edit.t	Sat Aug 03 16:37:17 2013 +0200
+++ b/tests/test-histedit-edit.t	Sat Aug 03 16:40:13 2013 +0200
@@ -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