Mercurial > hg

diff tests/test-histedit-obsolete.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 21daee53c101
children e5d9441ec281
line wrap: on
line diff
--- a/tests/test-histedit-obsolete.t	Fri Feb 08 16:27:59 2013 -0600
+++ b/tests/test-histedit-obsolete.t	Fri Feb 08 16:27:49 2013 -0600
@@ -139,7 +139,7 @@
   $ hg histedit -r '.' --commands commands.txt
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   adding c
-  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.
   [255]
   $ echo c >> c
@@ -278,7 +278,7 @@
   $ hg histedit -r 'b449568bf7fc' --commands commands.txt
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   adding f
-  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.
   [255]
   $ echo f >> f
@@ -328,7 +328,7 @@
   $ hg histedit -r 'b449568bf7fc' --commands commands.txt
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   adding f
-  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.
   [255]
   $ echo f >> f