173 $ revtest '-cC dirty linear' dirty 1 2 -cC |
173 $ revtest '-cC dirty linear' dirty 1 2 -cC |
174 abort: cannot specify both -c/--check and -C/--clean |
174 abort: cannot specify both -c/--check and -C/--clean |
175 parent=1 |
175 parent=1 |
176 M foo |
176 M foo |
177 |
177 |
|
178 $ cd .. |
|
179 |
|
180 Test updating with closed head |
|
181 --------------------------------------------------------------------- |
|
182 |
|
183 $ hg clone -U -q b1 closed-heads |
|
184 $ cd closed-heads |
|
185 |
|
186 Test updating if at least one non-closed branch head exists |
|
187 |
|
188 if on the closed branch head: |
|
189 - updating is no-op |
|
190 - "N other heads for ...." message is displayed |
|
191 |
|
192 $ hg update -q -C 3 |
|
193 $ hg commit --close-branch -m 6 |
|
194 $ norevtest "on closed branch head" clean 6 |
|
195 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 1 other heads for branch "default" |
|
197 parent=6 |
|
198 |
|
199 Test updating if all branch heads are closed |
|
200 |
|
201 if on the closed branch head: |
|
202 - updating is no-op |
|
203 - "N other heads for ...." message isn't displayed |
|
204 |
|
205 $ hg update -q -C 2 |
|
206 $ hg commit --close-branch -m 7 |
|
207 $ norevtest "all heads of branch default are closed" clean 6 |
|
208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
209 parent=6 |
|
210 |
|
211 $ cd ../b1 |
|
212 |
178 Test obsolescence behavior |
213 Test obsolescence behavior |
179 --------------------------------------------------------------------- |
214 --------------------------------------------------------------------- |
180 |
215 |
181 successors should be taken in account when checking head destination |
216 successors should be taken in account when checking head destination |
182 |
217 |