Mercurial > hg > mercurial-source

diff tests/test-histedit-edit.t @ 25986:43906060a3f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: abort rather than edit a public changeset (issue4704) This is suboptimal as the user still has to explicitly cancel the histedit afterwards, but it prevents the immediate problem. histedit should probably implicitly do 'hg histedit --abort' if a util.Abort is raised internally.
author Augie Fackler <augie@google.com>
date Fri, 05 Jun 2015 15:20:33 -0400
parents f0acc3e0bd32
children 56b2bcea2529
line wrap: on
line diff
--- a/tests/test-histedit-edit.t
+++ b/tests/test-histedit-edit.t
@@ -456,12 +456,12 @@
   > cat "\$1" | sed s/pick/fold/ > tmp
   > mv tmp "\$1"
   > EOF
-(BROKEN)
   $ HGEDITOR="sh ../edit.sh" hg histedit 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   reverting a
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/r0/.hg/strip-backup/18aa70c8ad22-3aea8ae3-backup.hg (glob)
-(BROKEN)
+  abort: cannot fold into public change 18aa70c8ad22
+  [255]
+TODO: this abort shouldn't be required, but it is for now to leave the repo in
+a clean state.
+  $ hg histedit --abort