Mercurial > hg

comparison tests/test-branches @ 7657:405cacb06745

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch closing: add test for branch closing (and reopening)
author John Mulligan <phlogistonjohn@asynchrono.us>
date Wed, 14 Jan 2009 21:47:38 -0500
parents 92d44ec32430
children 8766fee6f225
comparison
equal deleted inserted replaced
7656:6a24fb994701 7657:405cacb06745
48 echo "--- Branch a" 48 echo "--- Branch a"
49 hg log -b a 49 hg log -b a
50 50
51 echo "---- Branch b" 51 echo "---- Branch b"
52 hg log -b b 52 hg log -b b
53
54 echo "---- going to test branch closing"
55 hg branches
56 hg up -C b
57 echo 'xxx1' >> b
58 hg commit -d '7 0' -u test -m 'adding cset to branch b'
59 hg up -C aee39cd168d0
60 echo 'xxx2' >> b
61 hg commit -d '8 0' -u test -m 'adding head to branch b'
62 echo 'xxx3' >> b
63 hg commit -d '9 0' -u test -m 'adding another cset to branch b'
64 hg branches
65 hg heads
66 hg heads -a
67 hg commit -d '9 0' -u test --close-branch -m 'prune bad branch'
68 hg branches -a
69 hg up -C b
70 hg commit -d '9 0' -u test --close-branch -m 'close this part branch too'
71 echo '--- b branch should be inactive'
72 hg branches
73 hg branches -a
74 echo 'xxx4' >> b
75 hg commit -d '9 0' -u test -m 'reopen branch with a change'
76 echo '--- branch b is back in action'
77 hg branches -a
78 hg heads
79 hg heads -a