Mercurial > hg
diff doc/hg.1.txt @ 1190:737f9b90c571
Make import command reject patches that resemble email messages.
See changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e for an example
of why this is a good idea.
author | bos@serpentine.internal.keyresearch.com |
---|---|
date | Thu, 01 Sep 2005 09:04:18 -0700 |
parents | b3ceb2d470fc |
children | 77a0c7528c2f |
line wrap: on
line diff
--- a/doc/hg.1.txt Thu Sep 01 08:01:10 2005 -0700 +++ b/doc/hg.1.txt Thu Sep 01 09:04:18 2005 -0700 @@ -251,11 +251,18 @@ import [-p <n> -b <base> -f] <patches>:: Import a list of patches and commit them individually. + If a patch looks like a mail message (its first line starts with + "From " or looks like an RFC822 header), it will not be applied + unless the -m option is used. The importer neither parses nor + discards mail headers, so use -m only to override the "mailness" + safety check, not to import a real mail message. + options: -p, --strip <n> directory strip option for patch. This has the same meaning as the corresponding patch option -b <path> base directory to read patches from -f, --force skip check for outstanding uncommitted changes + -m, --mail-like apply a patch that appears to be a mail message aliases: patch