Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 3191:a32f65549b9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documentation clarification for --update option to pull and unbundle
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Sep 2006 23:14:22 +0200
parents e18c3d08528d
children 096f1c73cdc3
comparison
equal deleted inserted replaced
3190:e18c3d08528d 3191:a32f65549b9e
2971 _('hg parents [-b] [-r REV] [FILE]')), 2971 _('hg parents [-b] [-r REV] [FILE]')),
2972 "paths": (paths, [], _('hg paths [NAME]')), 2972 "paths": (paths, [], _('hg paths [NAME]')),
2973 "^pull": 2973 "^pull":
2974 (pull, 2974 (pull,
2975 [('u', 'update', None, 2975 [('u', 'update', None,
2976 _('update the working directory to tip after pull')), 2976 _('update to new tip if changesets were pulled')),
2977 ('f', 'force', None, 2977 ('f', 'force', None,
2978 _('run even when remote repository is unrelated')), 2978 _('run even when remote repository is unrelated')),
2979 ('r', 'rev', [], _('a specific revision up to which you would like to pull')), 2979 ('r', 'rev', [], _('a specific revision up to which you would like to pull')),
2980 ] + remoteopts, 2980 ] + remoteopts,
2981 _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')), 2981 _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')),
3068 ('', 'template', '', _('display with template'))], 3068 ('', 'template', '', _('display with template'))],
3069 _('hg tip [-b] [-p]')), 3069 _('hg tip [-b] [-p]')),
3070 "unbundle": 3070 "unbundle":
3071 (unbundle, 3071 (unbundle,
3072 [('u', 'update', None, 3072 [('u', 'update', None,
3073 _('update the working directory to tip after unbundle'))], 3073 _('update to new tip if changesets were unbundled'))],
3074 _('hg unbundle [-u] FILE')), 3074 _('hg unbundle [-u] FILE')),
3075 "debugundo|undo": (undo, [], _('hg undo')), 3075 "debugundo|undo": (undo, [], _('hg undo')),
3076 "^update|up|checkout|co": 3076 "^update|up|checkout|co":
3077 (update, 3077 (update,
3078 [('b', 'branch', '', _('checkout the head of a specific branch')), 3078 [('b', 'branch', '', _('checkout the head of a specific branch')),