Show More
@@ -397,16 +397,16 b' def _statusotherbranchheads(ui, repo):' | |||||
397 | # ========= ========== |
|
397 | # ========= ========== | |
398 | otherheads = repo.revs('%ln - parents()', heads) |
|
398 | otherheads = repo.revs('%ln - parents()', heads) | |
399 | if repo['.'].closesbranch(): |
|
399 | if repo['.'].closesbranch(): | |
400 |
ui.status(_(' |
|
400 | ui.status(_('no open descendant heads on branch "%s", ' | |
401 |
' |
|
401 | 'updating to a closed head\n') % | |
402 | 'beware of re-opening closed head ' |
|
402 | (currentbranch)) | |
403 | 'by subsequent commit here.\n')) |
|
|||
404 | if otherheads: |
|
403 | if otherheads: | |
405 |
ui.status(_(' |
|
404 | ui.status(_('(committing will reopen the head, ' | |
406 | (len(otherheads), currentbranch)) |
|
405 | 'use `hg heads .` to see %i other heads)\n') % | |
|
406 | (len(otherheads))) | |||
407 | else: |
|
407 | else: | |
408 |
ui.status(_(' |
|
408 | ui.status(_('(committing will reopen branch "%s")\n') % | |
409 | currentbranch) |
|
409 | (currentbranch)) | |
410 | elif otherheads: |
|
410 | elif otherheads: | |
411 | ui.status(_('%i other heads for branch "%s"\n') % |
|
411 | ui.status(_('%i other heads for branch "%s"\n') % | |
412 | (len(otherheads), currentbranch)) |
|
412 | (len(otherheads), currentbranch)) |
@@ -260,9 +260,8 b' convert incrementally' | |||||
260 | $ cd repo.mtn-hg |
|
260 | $ cd repo.mtn-hg | |
261 | $ hg up -C |
|
261 | $ hg up -C | |
262 | 12 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
262 | 12 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
263 | updated to a closed branch head, because all descendant heads are closed. |
|
263 | no open descendant heads on branch "com.selenic.test", updating to a closed head | |
264 | beware of re-opening closed head by subsequent commit here. |
|
264 | (committing will reopen branch "com.selenic.test") | |
265 | all heads for branch "com.selenic.test" are closed. |
|
|||
266 | $ glog |
|
265 | $ glog | |
267 | @ 14 "largefile" files: large-file |
|
266 | @ 14 "largefile" files: large-file | |
268 | | |
|
267 | | |
@@ -194,9 +194,8 b' if on the closed branch head:' | |||||
194 | $ hg commit --close-branch -m 6 |
|
194 | $ hg commit --close-branch -m 6 | |
195 | $ norevtest "on closed branch head" clean 6 |
|
195 | $ norevtest "on closed branch head" clean 6 | |
196 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
197 | updated to a closed branch head, because all descendant heads are closed. |
|
197 | no open descendant heads on branch "default", updating to a closed head | |
198 | beware of re-opening closed head by subsequent commit here. |
|
198 | (committing will reopen the head, use `hg heads .` to see 1 other heads) | |
199 | 1 other heads for branch "default" |
|
|||
200 | parent=6 |
|
199 | parent=6 | |
201 |
|
200 | |||
202 | if descendant non-closed branch head exists, and it is only one branch head: |
|
201 | if descendant non-closed branch head exists, and it is only one branch head: | |
@@ -214,9 +213,8 b' if all descendant branch heads are close' | |||||
214 |
|
213 | |||
215 | $ norevtest "all descendant branch heads are closed" clean 3 |
|
214 | $ norevtest "all descendant branch heads are closed" clean 3 | |
216 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
215 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
217 | updated to a closed branch head, because all descendant heads are closed. |
|
216 | no open descendant heads on branch "default", updating to a closed head | |
218 | beware of re-opening closed head by subsequent commit here. |
|
217 | (committing will reopen the head, use `hg heads .` to see 1 other heads) | |
219 | 1 other heads for branch "default" |
|
|||
220 | parent=6 |
|
218 | parent=6 | |
221 |
|
219 | |||
222 | Test updating if all branch heads are closed |
|
220 | Test updating if all branch heads are closed | |
@@ -230,9 +228,8 b' if on the closed branch head:' | |||||
230 | $ hg commit --close-branch -m 7 |
|
228 | $ hg commit --close-branch -m 7 | |
231 | $ norevtest "all heads of branch default are closed" clean 6 |
|
229 | $ norevtest "all heads of branch default are closed" clean 6 | |
232 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
230 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
233 | updated to a closed branch head, because all descendant heads are closed. |
|
231 | no open descendant heads on branch "default", updating to a closed head | |
234 | beware of re-opening closed head by subsequent commit here. |
|
232 | (committing will reopen branch "default") | |
235 | all heads for branch "default" are closed. |
|
|||
236 | parent=6 |
|
233 | parent=6 | |
237 |
|
234 | |||
238 | if not on the closed branch head: |
|
235 | if not on the closed branch head: | |
@@ -242,9 +239,8 b' if not on the closed branch head:' | |||||
242 |
|
239 | |||
243 | $ norevtest "all heads of branch default are closed" clean 1 |
|
240 | $ norevtest "all heads of branch default are closed" clean 1 | |
244 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
241 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
245 | updated to a closed branch head, because all descendant heads are closed. |
|
242 | no open descendant heads on branch "default", updating to a closed head | |
246 | beware of re-opening closed head by subsequent commit here. |
|
243 | (committing will reopen branch "default") | |
247 | all heads for branch "default" are closed. |
|
|||
248 | parent=7 |
|
244 | parent=7 | |
249 |
|
245 | |||
250 | $ cd .. |
|
246 | $ cd .. | |
@@ -286,9 +282,8 b' if all branch heads are closed' | |||||
286 |
|
282 | |||
287 | $ norevtest "all branches are closed" clean null |
|
283 | $ norevtest "all branches are closed" clean null | |
288 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
284 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
289 | updated to a closed branch head, because all descendant heads are closed. |
|
285 | no open descendant heads on branch "foobar", updating to a closed head | |
290 | beware of re-opening closed head by subsequent commit here. |
|
286 | (committing will reopen branch "foobar") | |
291 | all heads for branch "foobar" are closed. |
|
|||
292 | parent=4 |
|
287 | parent=4 | |
293 |
|
288 | |||
294 | $ cd ../b1 |
|
289 | $ cd ../b1 |
General Comments 0
You need to be logged in to leave comments.
Login now