diff tests/test-backout.out @ 6162:554715e584e6

Add test case for backout on named branches (issue665)

--- a/tests/test-backout.out	Thu Feb 21 08:52:52 2008 +0100
+++ b/tests/test-backout.out	Fri Feb 22 11:28:14 2008 +0100
@@ -62,3 +62,28 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 removing c
 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
+# named branches
+adding default
+marked working directory as branch branch1
+adding file1
+marked working directory as branch branch2
+adding file2
+removing file1
+changeset 3:f1c642b1d8e5 backs out changeset 1:bf1602f437f3
+the backout changeset is a new head - do not forget to merge
+(use "backout --merge" if you want to auto-merge)
+% on branch2 with branch1 not merged, so file1 should still exist:
+45bbcd363bf0 (branch2)
+C default
+C file1
+C file2
+% on branch2 with branch1 merged, so file1 should be gone:
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+21d4dc6f9a41 (branch2) tip
+C default
+C file2
+% on branch1, so no file1 and file2:
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+f1c642b1d8e5 (branch1)
+C default