commands: fix help string for pull -u and unbundle -u. stable
authorGreg Ward <greg-hg@gerg.ca>
Tue, 05 Jan 2010 15:07:38 -0500
branchstable
changeset 10210 43f8abcec42d
parent 10209 c9194a7d7d3e
child 10211 a474f950357b
commands: fix help string for pull -u and unbundle -u. They update to new branch head, not new tip -- same as 'hg update'.
mercurial/commands.py
--- a/mercurial/commands.py	Mon Jan 04 23:45:45 2010 +0100
+++ b/mercurial/commands.py	Tue Jan 05 15:07:38 2010 -0500
@@ -3577,7 +3577,7 @@
     "^pull":
         (pull,
          [('u', 'update', None,
-           _('update to new tip if changesets were pulled')),
+           _('update to new branch head if changesets were pulled')),
           ('f', 'force', None,
            _('run even when remote repository is unrelated')),
           ('r', 'rev', [],
@@ -3689,7 +3689,7 @@
     "unbundle":
         (unbundle,
          [('u', 'update', None,
-           _('update to new tip if changesets were unbundled'))],
+           _('update to new branch head if changesets were unbundled'))],
          _('[-u] FILE...')),
     "^update|up|checkout|co":
         (update,