--- a/tests/test-merge-closedheads.out Wed Jul 07 14:11:59 2010 +0200
+++ b/tests/test-merge-closedheads.out Wed Jul 07 14:13:23 2010 +0200
@@ -16,3 +16,15 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
+% hg update -C 8
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% hg branch some-branch
+marked working directory as branch some-branch
+% hg commit
+% hg commit --close-branch
+% hg update default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% hg merge some-branch
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% hg commit (no reopening of some-branch)