##// END OF EJS Templates
update: use single quotes in use warning
timeless -
r29964:40f84553 default
parent child Browse files
Show More
@@ -416,8 +416,8 b' def _statusotherbranchheads(ui, repo):'
416 'updating to a closed head\n') %
416 'updating to a closed head\n') %
417 (currentbranch))
417 (currentbranch))
418 if otherheads:
418 if otherheads:
419 ui.warn(_('(committing will reopen the head, '
419 ui.warn(_("(committing will reopen the head, "
420 'use `hg heads .` to see %i other heads)\n') %
420 "use 'hg heads .' to see %i other heads)\n") %
421 (len(otherheads)))
421 (len(otherheads)))
422 else:
422 else:
423 ui.warn(_('(committing will reopen branch "%s")\n') %
423 ui.warn(_('(committing will reopen branch "%s")\n') %
@@ -195,7 +195,7 b' if on the closed branch head:'
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 no open descendant heads on branch "default", updating to a closed head
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)
198 (committing will reopen the head, use 'hg heads .' to see 1 other heads)
199 parent=6
199 parent=6
200
200
201 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,7 +214,7 b' if all descendant branch heads are close'
214 $ norevtest "all descendant branch heads are closed" clean 3
214 $ norevtest "all descendant branch heads are closed" clean 3
215 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
216 no open descendant heads on branch "default", updating to a closed head
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)
217 (committing will reopen the head, use 'hg heads .' to see 1 other heads)
218 parent=6
218 parent=6
219
219
220 Test updating if all branch heads are closed
220 Test updating if all branch heads are closed
General Comments 0
You need to be logged in to leave comments. Login now