equal
deleted
inserted
replaced
2 |
2 |
3 hg init a |
3 hg init a |
4 cd a |
4 cd a |
5 echo 'root' >root |
5 echo 'root' >root |
6 hg add root |
6 hg add root |
7 hg commit -d '0 0' -u test -m "Adding root node" |
7 hg commit -d '0 0' -m "Adding root node" |
8 |
8 |
9 echo 'a' >a |
9 echo 'a' >a |
10 hg add a |
10 hg add a |
11 hg branch a |
11 hg branch a |
12 hg commit -d '1 0' -u test -m "Adding a branch" |
12 hg commit -d '1 0' -m "Adding a branch" |
13 |
13 |
14 hg branch q |
14 hg branch q |
15 echo 'aa' >a |
15 echo 'aa' >a |
16 hg branch -C |
16 hg branch -C |
17 hg commit -d '2 0' -u test -m "Adding to a branch" |
17 hg commit -d '2 0' -m "Adding to a branch" |
18 |
18 |
19 hg update -C 0 |
19 hg update -C 0 |
20 echo 'b' >b |
20 echo 'b' >b |
21 hg add b |
21 hg add b |
22 hg branch b |
22 hg branch b |
23 hg commit -d '2 0' -u test -m "Adding b branch" |
23 hg commit -d '2 0' -m "Adding b branch" |
24 |
24 |
25 echo 'bh1' >bh1 |
25 echo 'bh1' >bh1 |
26 hg add bh1 |
26 hg add bh1 |
27 hg commit -d '3 0' -u test -m "Adding b branch head 1" |
27 hg commit -d '3 0' -m "Adding b branch head 1" |
28 |
28 |
29 hg update -C 2 |
29 hg update -C 2 |
30 echo 'bh2' >bh2 |
30 echo 'bh2' >bh2 |
31 hg add bh2 |
31 hg add bh2 |
32 hg commit -d '4 0' -u test -m "Adding b branch head 2" |
32 hg commit -d '4 0' -m "Adding b branch head 2" |
33 |
33 |
34 echo 'c' >c |
34 echo 'c' >c |
35 hg add c |
35 hg add c |
36 hg branch c |
36 hg branch c |
37 hg commit -d '5 0' -u test -m "Adding c branch" |
37 hg commit -d '5 0' -m "Adding c branch" |
38 |
38 |
39 echo 'd' >d |
39 echo 'd' >d |
40 hg add d |
40 hg add d |
41 hg branch 'a branch name much longer than the default justification used by branches' |
41 hg branch 'a branch name much longer than the default justification used by branches' |
42 hg commit -d '6 0' -u test -m "Adding d branch" |
42 hg commit -d '6 0' -m "Adding d branch" |
43 |
43 |
44 hg branches |
44 hg branches |
45 echo '-------' |
45 echo '-------' |
46 hg branches -a |
46 hg branches -a |
47 |
47 |
53 |
53 |
54 echo "---- going to test branch closing" |
54 echo "---- going to test branch closing" |
55 hg branches |
55 hg branches |
56 hg up -C b |
56 hg up -C b |
57 echo 'xxx1' >> b |
57 echo 'xxx1' >> b |
58 hg commit -d '7 0' -u test -m 'adding cset to branch b' |
58 hg commit -d '7 0' -m 'adding cset to branch b' |
59 hg up -C aee39cd168d0 |
59 hg up -C aee39cd168d0 |
60 echo 'xxx2' >> b |
60 echo 'xxx2' >> b |
61 hg commit -d '8 0' -u test -m 'adding head to branch b' |
61 hg commit -d '8 0' -m 'adding head to branch b' |
62 echo 'xxx3' >> b |
62 echo 'xxx3' >> b |
63 hg commit -d '9 0' -u test -m 'adding another cset to branch b' |
63 hg commit -d '9 0' -m 'adding another cset to branch b' |
64 hg branches |
64 hg branches |
65 hg heads |
65 hg heads |
66 hg heads -a |
66 hg heads -a |
67 hg commit -d '9 0' -u test --close-branch -m 'prune bad branch' |
67 hg commit -d '9 0' --close-branch -m 'prune bad branch' |
68 hg branches -a |
68 hg branches -a |
69 hg up -C b |
69 hg up -C b |
70 hg commit -d '9 0' -u test --close-branch -m 'close this part branch too' |
70 hg commit -d '9 0' --close-branch -m 'close this part branch too' |
71 echo '--- b branch should be inactive' |
71 echo '--- b branch should be inactive' |
72 hg branches |
72 hg branches |
73 hg branches -a |
73 hg branches -a |
74 echo 'xxx4' >> b |
74 echo 'xxx4' >> b |
75 hg commit -d '9 0' -u test -m 'reopen branch with a change' |
75 hg commit -d '9 0' -m 'reopen branch with a change' |
76 echo '--- branch b is back in action' |
76 echo '--- branch b is back in action' |
77 hg branches -a |
77 hg branches -a |
78 hg heads |
78 hg heads |
79 hg heads -a |
79 hg heads -a |