112 echo '=======' |
112 echo '=======' |
113 heads 0 1 2 3 4 5 6 7 |
113 heads 0 1 2 3 4 5 6 7 |
114 |
114 |
115 echo '% topological heads' |
115 echo '% topological heads' |
116 heads -t |
116 heads -t |
|
117 |
|
118 echo '______________' |
|
119 cd .. |
|
120 |
|
121 hg init newheadmsg |
|
122 cd newheadmsg |
|
123 |
|
124 echo '% created new head message' |
|
125 echo '% init: no msg' |
|
126 echo 1 > a |
|
127 hg ci -Am "a0: Initial root" |
|
128 echo 2 >> a |
|
129 hg ci -m "a1 (HN)" |
|
130 |
|
131 hg branch b |
|
132 echo 1 > b |
|
133 hg ci -Am "b2: Initial root for branch b" |
|
134 echo 2 >> b |
|
135 hg ci -m "b3 (HN)" |
|
136 |
|
137 echo '% case NN: msg' |
|
138 hg up -q null |
|
139 hg branch -f b |
|
140 echo 1 > B |
|
141 hg ci -Am "b4 (NN): new topo root for branch b" |
|
142 |
|
143 echo '% case HN: no msg' |
|
144 echo 2 >> B |
|
145 hg ci -m "b5 (HN)" |
|
146 |
|
147 echo '% case BN: msg' |
|
148 hg branch -f default |
|
149 echo 1 > A |
|
150 hg ci -Am "a6 (BN): new branch root" |
|
151 |
|
152 echo '% case CN: msg' |
|
153 hg up -q 4 |
|
154 echo 3 >> BB |
|
155 hg ci -Am "b7 (CN): regular new head" |
|
156 |
|
157 echo '% case BB: msg' |
|
158 hg up -q 4 |
|
159 hg merge -q 3 |
|
160 hg branch -f default |
|
161 hg ci -m "a8 (BB): weird new branch root" |
|
162 |
|
163 echo '% case CB: msg' |
|
164 hg up -q 4 |
|
165 hg merge -q 1 |
|
166 hg ci -m "b9 (CB): new head from branch merge" |
|
167 |
|
168 echo '% case HB: no msg' |
|
169 hg up -q 7 |
|
170 hg merge -q 6 |
|
171 hg ci -m "b10 (HB): continuing head from branch merge" |
|
172 |
|
173 echo '% case CC: msg' |
|
174 hg up -q 4 |
|
175 hg merge -q 2 |
|
176 hg ci -m "b11 (CC): new head from merge" |
|
177 |
|
178 echo '% case CH: no msg' |
|
179 hg up -q 2 |
|
180 hg merge -q 10 |
|
181 hg ci -m "b12 (CH): continuing head from merge" |
|
182 |
|
183 echo '% case HH: no msg' |
|
184 hg merge -q 3 |
|
185 hg ci -m "b12 (HH): merging two heads" |
|
186 |