Mercurial > hg

diff tests/test-merge-closedheads @ 11516:ee876e42dd74 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-closedheads: test cc982ff2dcf8
author Martin Geisler <mg@aragost.com>
date Wed, 07 Jul 2010 14:13:23 +0200
parents ca8d05e1f1d1
children
line wrap: on
line diff
--- a/tests/test-merge-closedheads	Wed Jul 07 14:11:59 2010 +0200
+++ b/tests/test-merge-closedheads	Wed Jul 07 14:13:23 2010 +0200
@@ -48,4 +48,26 @@
 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 <<EOF
+[extensions]
+graphlog =
+EOF
+
+#hg glog