diff -r fca15617721c -r 71105dd7d4df tests/test-merge-closedheads --- a/tests/test-merge-closedheads Thu Aug 19 10:25:41 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -#!/bin/sh - -hgcommit() { - hg commit -u user -d '0 0' "$@" -} - -hg init clhead -cd clhead - - -touch foo && hg add && hgcommit -m 'foo' -touch bar && hg add && hgcommit -m 'bar' -touch baz && hg add && hgcommit -m 'baz' - -echo "flub" > foo -hgcommit -m "flub" -echo "nub" > foo -hgcommit -m "nub" - -hg up -C 2 - -echo "c1" > c1 -hg add c1 -hgcommit -m "c1" -echo "c2" > c1 -hgcommit -m "c2" - -hg up -C 2 - -echo "d1" > d1 -hg add d1 -hgcommit -m "d1" -echo "d2" > d1 -hgcommit -m "d2" -hg tag -l good - -echo '% fail with three heads' -hg up -C good -hg merge - -echo '% close one of the heads' -hg up -C 6 -hgcommit -m 'close this head' --close-branch - -echo '% succeed with two open heads' -hg up -C good -hg up -C good -hg merge -hgcommit -m 'merged heads' - -echo '% hg update -C 8' -hg update -C 8 - -echo '% hg branch some-branch' -hg branch some-branch -echo '% hg commit' -hgcommit -m 'started some-branch' -echo '% hg commit --close-branch' -hgcommit --close-branch -m 'closed some-branch' - -echo '% hg update default' -hg update default -echo '% hg merge some-branch' -hg merge some-branch -echo '% hg commit (no reopening of some-branch)' -hgcommit -m 'merge with closed branch' - -cat >> $HGRCPATH <