##// END OF EJS Templates
Merge with crew-stable
Merge with crew-stable

File last commit:

r8991:7e0b31df default
r10180:a9f60014 merge default
Show More
test-branches
90 lines | 1.7 KiB | text/plain | TextLexer
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675 #!/bin/sh
hg init a
cd a
echo 'root' >root
hg add root
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '0 0' -m "Adding root node"
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675
echo 'a' >a
hg add a
hg branch a
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '1 0' -m "Adding a branch"
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675
Sune Foldager
branch: added more support for named branches...
r7006 hg branch q
echo 'aa' >a
hg branch -C
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '2 0' -m "Adding to a branch"
Sune Foldager
branch: added more support for named branches...
r7006
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675 hg update -C 0
echo 'b' >b
hg add b
hg branch b
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '2 0' -m "Adding b branch"
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675
echo 'bh1' >bh1
hg add bh1
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '3 0' -m "Adding b branch head 1"
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675
hg update -C 2
echo 'bh2' >bh2
hg add bh2
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '4 0' -m "Adding b branch head 2"
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675
echo 'c' >c
hg add c
hg branch c
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '5 0' -m "Adding c branch"
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675
Stefano Tortarolo
Active branches fix (issue1104)
r6631 echo 'd' >d
hg add d
Patrick Mezard
test-branches: add a test for long branch name (issue 1230)
r6815 hg branch 'a branch name much longer than the default justification used by branches'
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '6 0' -m "Adding d branch"
Stefano Tortarolo
Active branches fix (issue1104)
r6631
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675 hg branches
echo '-------'
hg branches -a
Dustin Sallings
Option to log to only show changesets within a specified branch.
r6067
echo "--- Branch a"
hg log -b a
echo "---- Branch b"
hg log -b b
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657
echo "---- going to test branch closing"
hg branches
hg up -C b
echo 'xxx1' >> b
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '7 0' -m 'adding cset to branch b'
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 hg up -C aee39cd168d0
echo 'xxx2' >> b
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '8 0' -m 'adding head to branch b'
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 echo 'xxx3' >> b
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '9 0' -m 'adding another cset to branch b'
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 hg branches
John Mulligan
heads: show closed heads only when --closed is passed...
r8695 hg heads --closed
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 hg heads
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '9 0' --close-branch -m 'prune bad branch'
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 hg branches -a
hg up -C b
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '9 0' --close-branch -m 'close this part branch too'
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 echo '--- b branch should be inactive'
hg branches
Matt Mackall
branches: add --closed flag for consistency with heads
r8991 hg branches -c
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 hg branches -a
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
r8796 hg heads b
hg heads --closed b
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 echo 'xxx4' >> b
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '9 0' -m 'reopen branch with a change'
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 echo '--- branch b is back in action'
hg branches -a
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
r8796 echo '---- test heads listings'
John Mulligan
branch closing: add test for branch closing (and reopening)
r7657 hg heads
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
r8796 echo '% branch default'
hg heads default
echo '% branch a'
hg heads a
hg heads --active a
echo '% branch b'
hg heads b
hg heads --closed b