diff tests/test-histedit-obsolete.t @ 18935:e5d9441ec281

dispatch: exit with status 1 for an InterventionRequired exception (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:17:46 -0600
parents 93f3a06b2035
children 53060cc1b601
line wrap: on
line diff
--- a/tests/test-histedit-obsolete.t	Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-histedit-obsolete.t	Fri Feb 08 16:17:46 2013 -0600
@@ -141,7 +141,7 @@
   adding c
   Make changes as needed, you may commit or record as needed now.
   When you are finished, run hg histedit --continue to resume.
-  [255]
+  [1]
   $ echo c >> c
   $ hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -280,7 +280,7 @@
   adding f
   Make changes as needed, you may commit or record as needed now.
   When you are finished, run hg histedit --continue to resume.
-  [255]
+  [1]
   $ echo f >> f
   $ hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -330,7 +330,7 @@
   adding f
   Make changes as needed, you may commit or record as needed now.
   When you are finished, run hg histedit --continue to resume.
-  [255]
+  [1]
   $ echo f >> f
   $ hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved