--- a/tests/test-backout.t Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-backout.t Thu Sep 16 17:51:32 2010 -0500
@@ -7,8 +7,10 @@
$ hg backout
abort: please specify a revision to backout
+ [255]
$ hg backout -r 0 0
abort: please specify just one revision
+ [255]
# basic operation
@@ -69,6 +71,7 @@
$ hg backout 1
abort: cannot backout change on a different branch
+ [255]
$ echo c > c
$ hg ci -Am2
adding c
@@ -78,6 +81,7 @@
$ hg backout 1
abort: cannot backout change on a different branch
+ [255]
# backout with merge
@@ -138,6 +142,7 @@
$ hg update -C tip
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg locate b
+ [1]
$ cd ..
$ hg init m
@@ -166,16 +171,19 @@
$ hg backout 4
abort: cannot backout a merge changeset without --parent
+ [255]
# backout of merge with bad parent should fail
$ hg backout --parent 0 4
abort: cb9a9f314b8b is not a parent of b2f3bb92043e
+ [255]
# backout of non-merge with parent should fail
$ hg backout --parent 0 3
abort: cannot use --parent on non-merge changeset
+ [255]
# backout with valid parent should be ok