Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 10210:43f8abcec42d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: fix help string for pull -u and unbundle -u. They update to new branch head, not new tip -- same as 'hg update'.
author Greg Ward <greg-hg@gerg.ca>
date Tue, 05 Jan 2010 15:07:38 -0500
parents 8b5ca9b9b435
children 3ab391dd5ec5 712dc3b6db68
comparison
equal deleted inserted replaced
10209:c9194a7d7d3e 10210:43f8abcec42d
3575 _('[-r REV] [FILE]')), 3575 _('[-r REV] [FILE]')),
3576 "paths": (paths, [], _('[NAME]')), 3576 "paths": (paths, [], _('[NAME]')),
3577 "^pull": 3577 "^pull":
3578 (pull, 3578 (pull,
3579 [('u', 'update', None, 3579 [('u', 'update', None,
3580 _('update to new tip if changesets were pulled')), 3580 _('update to new branch head if changesets were pulled')),
3581 ('f', 'force', None, 3581 ('f', 'force', None,
3582 _('run even when remote repository is unrelated')), 3582 _('run even when remote repository is unrelated')),
3583 ('r', 'rev', [], 3583 ('r', 'rev', [],
3584 _('a specific remote revision up to which you would like to pull')), 3584 _('a specific remote revision up to which you would like to pull')),
3585 ] + remoteopts, 3585 ] + remoteopts,
3687 ] + templateopts, 3687 ] + templateopts,
3688 _('[-p] [-g]')), 3688 _('[-p] [-g]')),
3689 "unbundle": 3689 "unbundle":
3690 (unbundle, 3690 (unbundle,
3691 [('u', 'update', None, 3691 [('u', 'update', None,
3692 _('update to new tip if changesets were unbundled'))], 3692 _('update to new branch head if changesets were unbundled'))],
3693 _('[-u] FILE...')), 3693 _('[-u] FILE...')),
3694 "^update|up|checkout|co": 3694 "^update|up|checkout|co":
3695 (update, 3695 (update,
3696 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), 3696 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
3697 ('c', 'check', None, _('check for uncommitted changes')), 3697 ('c', 'check', None, _('check for uncommitted changes')),