comparison mercurial/commands.py @ 6304:d99b4e8652b3

Make clear that for a changegroup '-r' pulls "up to" a revision If some better wording is found, it can be changed later.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 20 Mar 2008 01:47:35 +0100
parents 653ddd1d7cd7
children 55ba3bc5b8fd
comparison
equal deleted inserted replaced
6303:577a7da1d44b 6304:d99b4e8652b3
2885 "bundle": 2885 "bundle":
2886 (bundle, 2886 (bundle,
2887 [('f', 'force', None, 2887 [('f', 'force', None,
2888 _('run even when remote repository is unrelated')), 2888 _('run even when remote repository is unrelated')),
2889 ('r', 'rev', [], 2889 ('r', 'rev', [],
2890 _('a changeset you would like to bundle')), 2890 _('a changeset up to which you would like to bundle')),
2891 ('', 'base', [], 2891 ('', 'base', [],
2892 _('a base changeset to specify instead of a destination')), 2892 _('a base changeset to specify instead of a destination')),
2893 ('a', 'all', None, 2893 ('a', 'all', None,
2894 _('bundle all changesets in the repository')), 2894 _('bundle all changesets in the repository')),
2895 ] + remoteopts, 2895 ] + remoteopts,
3037 (incoming, 3037 (incoming,
3038 [('f', 'force', None, 3038 [('f', 'force', None,
3039 _('run even when remote repository is unrelated')), 3039 _('run even when remote repository is unrelated')),
3040 ('n', 'newest-first', None, _('show newest record first')), 3040 ('n', 'newest-first', None, _('show newest record first')),
3041 ('', 'bundle', '', _('file to store the bundles into')), 3041 ('', 'bundle', '', _('file to store the bundles into')),
3042 ('r', 'rev', [], _('a specific revision up to which you would like to pull')), 3042 ('r', 'rev', [],
3043 _('a specific revision up to which you would like to pull')),
3043 ] + logopts + remoteopts, 3044 ] + logopts + remoteopts,
3044 _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...' 3045 _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...'
3045 ' [--bundle FILENAME] [SOURCE]')), 3046 ' [--bundle FILENAME] [SOURCE]')),
3046 "^init": 3047 "^init":
3047 (init, 3048 (init,
3085 _('hg merge [-f] [[-r] REV]')), 3086 _('hg merge [-f] [[-r] REV]')),
3086 "outgoing|out": 3087 "outgoing|out":
3087 (outgoing, 3088 (outgoing,
3088 [('f', 'force', None, 3089 [('f', 'force', None,
3089 _('run even when remote repository is unrelated')), 3090 _('run even when remote repository is unrelated')),
3090 ('r', 'rev', [], _('a specific revision you would like to push')), 3091 ('r', 'rev', [],
3092 _('a specific revision up to which you would like to push')),
3091 ('n', 'newest-first', None, _('show newest record first')), 3093 ('n', 'newest-first', None, _('show newest record first')),
3092 ] + logopts + remoteopts, 3094 ] + logopts + remoteopts,
3093 _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')), 3095 _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
3094 "^parents": 3096 "^parents":
3095 (parents, 3097 (parents,
3108 ] + remoteopts, 3110 ] + remoteopts,
3109 _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), 3111 _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
3110 "^push": 3112 "^push":
3111 (push, 3113 (push,
3112 [('f', 'force', None, _('force push')), 3114 [('f', 'force', None, _('force push')),
3113 ('r', 'rev', [], _('a specific revision you would like to push')), 3115 ('r', 'rev', [],
3116 _('a specific revision up to which you would like to push')),
3114 ] + remoteopts, 3117 ] + remoteopts,
3115 _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), 3118 _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
3116 "recover": (recover, [], _('hg recover')), 3119 "recover": (recover, [], _('hg recover')),
3117 "^remove|rm": 3120 "^remove|rm":
3118 (remove, 3121 (remove,