Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 28866:02be5fc18c0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: document --exact behavior in more detail
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Mar 2016 10:47:33 -0500
parents 5a398627db92
children ffcc649a4e8f
comparison
equal deleted inserted replaced
28865:16255662446d 28866:02be5fc18c0c
4782 ('', 'bypass', None, 4782 ('', 'bypass', None,
4783 _("apply patch without touching the working directory")), 4783 _("apply patch without touching the working directory")),
4784 ('', 'partial', None, 4784 ('', 'partial', None,
4785 _('commit even if some hunks fail')), 4785 _('commit even if some hunks fail')),
4786 ('', 'exact', None, 4786 ('', 'exact', None,
4787 _('apply patch to the nodes from which it was generated')), 4787 _('abort if patch would apply lossily')),
4788 ('', 'prefix', '', 4788 ('', 'prefix', '',
4789 _('apply patch to subdirectory'), _('DIR')), 4789 _('apply patch to subdirectory'), _('DIR')),
4790 ('', 'import-branch', None, 4790 ('', 'import-branch', None,
4791 _('use any branch information in patch (implied by --exact)'))] + 4791 _('use any branch information in patch (implied by --exact)'))] +
4792 commitopts + commitopts2 + similarityopts, 4792 commitopts + commitopts2 + similarityopts,
4822 override these. 4822 override these.
4823 4823
4824 If --exact is specified, import will set the working directory to 4824 If --exact is specified, import will set the working directory to
4825 the parent of each patch before applying it, and will abort if the 4825 the parent of each patch before applying it, and will abort if the
4826 resulting changeset has a different ID than the one recorded in 4826 resulting changeset has a different ID than the one recorded in
4827 the patch. This may happen due to character set problems or other 4827 the patch. This will guard against various ways that portable
4828 deficiencies in the text patch format. 4828 patch formats and mail systems might fail to transfer Mercurial
4829 data or metadata. See ':hg: bundle' for lossless transmission.
4829 4830
4830 Use --partial to ensure a changeset will be created from the patch 4831 Use --partial to ensure a changeset will be created from the patch
4831 even if some hunks fail to apply. Hunks that fail to apply will be 4832 even if some hunks fail to apply. Hunks that fail to apply will be
4832 written to a <target-file>.rej file. Conflicts can then be resolved 4833 written to a <target-file>.rej file. Conflicts can then be resolved
4833 by hand before :hg:`commit --amend` is run to update the created 4834 by hand before :hg:`commit --amend` is run to update the created