comparison mercurial/commands.py @ 27898:2cc44efcb7cf

graft: clarify in help that `-r` is not just optional Positional parameters are also treated as revisions, but the order of revisions matters and it will often be wrong if the user understands it as `-r` taking multiple revisions as `-r REV1 REV2`. (Alternatively, `-r` could be turned into a no-op flag as the documentation suggests. That would however be less "semantic markup" and I agree with the implementation in 55e7f352b1d3 but not the documentation.)
author Mads Kiilerich <madski@unity3d.com>
date Sun, 17 Jan 2016 19:33:02 +0100
parents ce76c4d2b85c
children 78b9fdb844c1
comparison
equal deleted inserted replaced
27897:2fdbf22a1b63 27898:2cc44efcb7cf
3821 ('D', 'currentdate', False, 3821 ('D', 'currentdate', False,
3822 _('record the current date as commit date')), 3822 _('record the current date as commit date')),
3823 ('U', 'currentuser', False, 3823 ('U', 'currentuser', False,
3824 _('record the current user as committer'), _('DATE'))] 3824 _('record the current user as committer'), _('DATE'))]
3825 + commitopts2 + mergetoolopts + dryrunopts, 3825 + commitopts2 + mergetoolopts + dryrunopts,
3826 _('[OPTION]... [-r] REV...')) 3826 _('[OPTION]... [-r REV]... REV...'))
3827 def graft(ui, repo, *revs, **opts): 3827 def graft(ui, repo, *revs, **opts):
3828 '''copy changes from other branches onto the current branch 3828 '''copy changes from other branches onto the current branch
3829 3829
3830 This command uses Mercurial's merge logic to copy individual 3830 This command uses Mercurial's merge logic to copy individual
3831 changes from other branches without merging branches in the 3831 changes from other branches without merging branches in the