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