Mercurial > public > mercurial-scm > hg

diff tests/test-histedit-edit.t @ 18934:93f3a06b2035

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:27:49 -0600
parents 79580b3140cd
children 6891e361bec6
line wrap: on
line diff
--- a/tests/test-histedit-edit.t	Fri Feb 08 16:27:59 2013 -0600
+++ b/tests/test-histedit-edit.t	Fri Feb 08 16:27:49 2013 -0600
@@ -63,7 +63,7 @@
 edit the history
   $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  abort: Make changes as needed, you may commit or record as needed now.
+  Make changes as needed, you may commit or record as needed now.
   When you are finished, run hg histedit --continue to resume.
 
 Go at a random point and try to continue
@@ -151,7 +151,7 @@
   > EOF
   $ HGEDITOR="cat \"$EDITED\" > " hg histedit tip 2>&1 | fixbundle
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  abort: Make changes as needed, you may commit or record as needed now.
+  Make changes as needed, you may commit or record as needed now.
   When you are finished, run hg histedit --continue to resume.
   $ hg status
   A f