--- a/hgext/evolve.py Mon Jun 03 15:03:55 2013 +0200
+++ b/hgext/evolve.py Mon Jun 03 15:06:18 2013 +0200
@@ -887,7 +887,7 @@
% len(troubled))
return 2
else:
- ui.write_err(_('no troubled changesets\n'))
+ ui.write_err(_('no troubled changesets\n'))
return 1
while tr is not None:
@@ -895,7 +895,7 @@
if not allopt:
return result
tr = _picknexttroubled(ui, repo, anyopt or allopt)
-
+
def _evolveany(ui, repo, tr, dryrunopt):
repo = repo.unfiltered()
@@ -1204,7 +1204,7 @@
[],
'')
def cmdgdown(ui, repo):
- """update to parent an display summary lines"""
+ """update to parent and display summary lines"""
wkctx = repo[None]
wparents = wkctx.parents()
if len(wparents) != 1:
@@ -1227,7 +1227,7 @@
[],
'')
def cmdup(ui, repo):
- """update to child an display summary lines"""
+ """update to child and display summary lines"""
wkctx = repo[None]
wparents = wkctx.parents()
if len(wparents) != 1:
@@ -1378,7 +1378,7 @@
@command('amend|refresh',
[('A', 'addremove', None,
_('mark new/missing files as added/removed before committing')),
- ('n', 'note', '', _('use text as commit message for this update')),
+ ('n', 'note', '', _('use text as commit message for this update (DEPRECATED)')),
('e', 'edit', False, _('invoke editor on commit messages')),
] + walkopts + commitopts + commitopts2,
_('[OPTION]... [FILE]...'))