Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 19409:ea4342d0e6fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback: mark as deprecated
author Matt Mackall <mpm@selenic.com>
date Tue, 16 Jul 2013 17:10:26 -0500
parents 9013f2930a4a
children b2b08be5f556
comparison
equal deleted inserted replaced
19408:c7ec39c1a381 19409:ea4342d0e6fe
3539 [('p', 'strip', 1, 3539 [('p', 'strip', 1,
3540 _('directory strip option for patch. This has the same ' 3540 _('directory strip option for patch. This has the same '
3541 'meaning as the corresponding patch option'), _('NUM')), 3541 'meaning as the corresponding patch option'), _('NUM')),
3542 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), 3542 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3543 ('e', 'edit', False, _('invoke editor on commit messages')), 3543 ('e', 'edit', False, _('invoke editor on commit messages')),
3544 ('f', 'force', None, _('skip check for outstanding uncommitted changes')), 3544 ('f', 'force', None,
3545 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3545 ('', 'no-commit', None, 3546 ('', 'no-commit', None,
3546 _("don't commit, just update the working directory")), 3547 _("don't commit, just update the working directory")),
3547 ('', 'bypass', None, 3548 ('', 'bypass', None,
3548 _("apply patch without touching the working directory")), 3549 _("apply patch without touching the working directory")),
3549 ('', 'exact', None, 3550 ('', 'exact', None,
3556 """import an ordered set of patches 3557 """import an ordered set of patches
3557 3558
3558 Import a list of patches and commit them individually (unless 3559 Import a list of patches and commit them individually (unless
3559 --no-commit is specified). 3560 --no-commit is specified).
3560 3561
3561 If there are outstanding changes in the working directory, import 3562 Because import first applies changes to the working directory,
3562 will abort unless given the -f/--force flag. 3563 import will abort if there are outstanding changes.
3563 3564
3564 You can import a patch straight from a mail message. Even patches 3565 You can import a patch straight from a mail message. Even patches
3565 as attachments work (to use the body part, it must have type 3566 as attachments work (to use the body part, it must have type
3566 text/plain or text/x-patch). From and Subject headers of email 3567 text/plain or text/x-patch). From and Subject headers of email
3567 message are used as default committer and commit message. All 3568 message are used as default committer and commit message. All
5011 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) 5012 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5012 5013
5013 @command('rollback', dryrunopts + 5014 @command('rollback', dryrunopts +
5014 [('f', 'force', False, _('ignore safety measures'))]) 5015 [('f', 'force', False, _('ignore safety measures'))])
5015 def rollback(ui, repo, **opts): 5016 def rollback(ui, repo, **opts):
5016 """roll back the last transaction (dangerous) 5017 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5017 5018
5018 This command should be used with care. There is only one level of 5019 This command should be used with care. There is only one level of
5019 rollback, and there is no way to undo a rollback. It will also 5020 rollback, and there is no way to undo a rollback. It will also
5020 restore the dirstate at the time of the last transaction, losing 5021 restore the dirstate at the time of the last transaction, losing
5021 any dirstate changes since that time. This command does not alter 5022 any dirstate changes since that time. This command does not alter