update test-backout.out
authorVadim Gelfer <vadim.gelfer@gmail.com>
Sat, 15 Jul 2006 09:19:40 -0700
changeset 2619 fc0ec2b64150
parent 2618 8367b67ad397
child 2620 de82749d3a71
update test-backout.out
tests/test-backout.out
--- a/tests/test-backout.out	Sat Jul 15 17:01:01 2006 +0200
+++ b/tests/test-backout.out	Sat Jul 15 09:19:40 2006 -0700
@@ -29,3 +29,23 @@
 the backout changeset is a new head - do not forget to merge
 (use "backout -m" if you want to auto-merge)
 b: No such file or directory
+adding a
+adding b
+adding c
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+adding d
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+# backout of merge should fail
+abort: cannot back out a merge changeset without --parent
+# backout of merge with bad parent should fail
+abort: cb9a9f314b8b is not a parent of b2f3bb92043e
+# backout of non-merge with parent should fail
+abort: cannot use --parent on non-merge changeset
+# backout with valid parent should be ok
+removing d
+changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e
+rolling back last transaction
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+removing c
+changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e