facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

update: use single quotes in use warning

Browse Source
This commit is contained in:
timeless 2016-09-02 21:49:33 +00:00
parent 9b9d2357c6
commit 263e302697
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/destutil.py
View File

@ -416,8 +416,8 @@ def _statusotherbranchheads(ui, repo):
'updating to a closed head\n') %
(currentbranch))
if otherheads:
ui.warn(_('(committing will reopen the head, '
'use `hg heads .` to see %i other heads)\n') %
ui.warn(_("(committing will reopen the head, "
"use 'hg heads .' to see %i other heads)\n") %
(len(otherheads)))
else:
ui.warn(_('(committing will reopen branch "%s")\n') %

4
tests/test-update-branches.t
View File

@ -195,7 +195,7 @@ if on the closed branch head:
$ norevtest "on closed branch head" clean 6
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
no open descendant heads on branch "default", updating to a closed head
(committing will reopen the head, use `hg heads .` to see 1 other heads)
(committing will reopen the head, use 'hg heads .' to see 1 other heads)
parent=6
if descendant non-closed branch head exists, and it is only one branch head:
@ -214,7 +214,7 @@ if all descendant branch heads are closed, but there is another branch head:
$ norevtest "all descendant branch heads are closed" clean 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
no open descendant heads on branch "default", updating to a closed head
(committing will reopen the head, use `hg heads .` to see 1 other heads)
(committing will reopen the head, use 'hg heads .' to see 1 other heads)
parent=6
Test updating if all branch heads are closed