Show More
@@ -50,3 +50,30 b' hg log -b a' | |||
|
50 | 50 | |
|
51 | 51 | echo "---- Branch b" |
|
52 | 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 |
@@ -49,3 +49,102 b' user: test' | |||
|
49 | 49 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
50 | 50 | summary: Adding b branch |
|
51 | 51 | |
|
52 | ---- going to test branch closing | |
|
53 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
|
54 | b 4:aee39cd168d0 | |
|
55 | c 6:589736a22561 (inactive) | |
|
56 | a 5:d8cbc61dbaa6 (inactive) | |
|
57 | default 0:19709c5a4e75 (inactive) | |
|
58 | 2 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
|
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
60 | created new head | |
|
61 | b 10:bfbe841b666e | |
|
62 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
|
63 | c 6:589736a22561 (inactive) | |
|
64 | a 5:d8cbc61dbaa6 (inactive) | |
|
65 | default 0:19709c5a4e75 (inactive) | |
|
66 | changeset: 10:bfbe841b666e | |
|
67 | branch: b | |
|
68 | tag: tip | |
|
69 | user: test | |
|
70 | date: Thu Jan 01 00:00:09 1970 +0000 | |
|
71 | summary: adding another cset to branch b | |
|
72 | ||
|
73 | changeset: 8:eebb944467c9 | |
|
74 | branch: b | |
|
75 | parent: 4:aee39cd168d0 | |
|
76 | user: test | |
|
77 | date: Thu Jan 01 00:00:07 1970 +0000 | |
|
78 | summary: adding cset to branch b | |
|
79 | ||
|
80 | changeset: 7:10ff5895aa57 | |
|
81 | branch: a branch name much longer than the default justification used by branches | |
|
82 | user: test | |
|
83 | date: Thu Jan 01 00:00:06 1970 +0000 | |
|
84 | summary: Adding d branch | |
|
85 | ||
|
86 | changeset: 10:bfbe841b666e | |
|
87 | branch: b | |
|
88 | tag: tip | |
|
89 | user: test | |
|
90 | date: Thu Jan 01 00:00:09 1970 +0000 | |
|
91 | summary: adding another cset to branch b | |
|
92 | ||
|
93 | changeset: 8:eebb944467c9 | |
|
94 | branch: b | |
|
95 | parent: 4:aee39cd168d0 | |
|
96 | user: test | |
|
97 | date: Thu Jan 01 00:00:07 1970 +0000 | |
|
98 | summary: adding cset to branch b | |
|
99 | ||
|
100 | changeset: 7:10ff5895aa57 | |
|
101 | branch: a branch name much longer than the default justification used by branches | |
|
102 | user: test | |
|
103 | date: Thu Jan 01 00:00:06 1970 +0000 | |
|
104 | summary: Adding d branch | |
|
105 | ||
|
106 | b 8:eebb944467c9 | |
|
107 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
|
108 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
109 | --- b branch should be inactive | |
|
110 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
|
111 | b 12:2da6583810df (closed) | |
|
112 | c 6:589736a22561 (inactive) | |
|
113 | a 5:d8cbc61dbaa6 (inactive) | |
|
114 | default 0:19709c5a4e75 (inactive) | |
|
115 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
|
116 | --- branch b is back in action | |
|
117 | b 13:6ac12926b8c3 | |
|
118 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
|
119 | changeset: 13:6ac12926b8c3 | |
|
120 | branch: b | |
|
121 | tag: tip | |
|
122 | user: test | |
|
123 | date: Thu Jan 01 00:00:09 1970 +0000 | |
|
124 | summary: reopen branch with a change | |
|
125 | ||
|
126 | changeset: 11:c84627f3c15d | |
|
127 | branch: b | |
|
128 | user: test | |
|
129 | date: Thu Jan 01 00:00:09 1970 +0000 | |
|
130 | summary: prune bad branch | |
|
131 | ||
|
132 | changeset: 7:10ff5895aa57 | |
|
133 | branch: a branch name much longer than the default justification used by branches | |
|
134 | user: test | |
|
135 | date: Thu Jan 01 00:00:06 1970 +0000 | |
|
136 | summary: Adding d branch | |
|
137 | ||
|
138 | changeset: 13:6ac12926b8c3 | |
|
139 | branch: b | |
|
140 | tag: tip | |
|
141 | user: test | |
|
142 | date: Thu Jan 01 00:00:09 1970 +0000 | |
|
143 | summary: reopen branch with a change | |
|
144 | ||
|
145 | changeset: 7:10ff5895aa57 | |
|
146 | branch: a branch name much longer than the default justification used by branches | |
|
147 | user: test | |
|
148 | date: Thu Jan 01 00:00:06 1970 +0000 | |
|
149 | summary: Adding d branch | |
|
150 |
@@ -27,13 +27,14 b' interactively select changes to commit' | |||
|
27 | 27 | |
|
28 | 28 | options: |
|
29 | 29 | |
|
30 | -A --addremove mark new/missing files as added/removed before committing | |
|
31 | -I --include include names matching the given patterns | |
|
32 |
- |
|
|
33 | -m --message use <text> as commit message | |
|
34 | -l --logfile read commit message from <file> | |
|
35 | -d --date record datecode as commit date | |
|
36 |
- |
|
|
30 | -A --addremove mark new/missing files as added/removed before committing | |
|
31 | --close-branch mark a branch as closed, hiding it from the branch list | |
|
32 | -I --include include names matching the given patterns | |
|
33 | -X --exclude exclude names matching the given patterns | |
|
34 | -m --message use <text> as commit message | |
|
35 | -l --logfile read commit message from <file> | |
|
36 | -d --date record datecode as commit date | |
|
37 | -u --user record user as committer | |
|
37 | 38 | |
|
38 | 39 | use "hg -v help record" to show global options |
|
39 | 40 | % select no files |
General Comments 0
You need to be logged in to leave comments.
Login now