Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
1189:4cbcc54695b2 | 1190:737f9b90c571 |
---|---|
249 aliases: id | 249 aliases: id |
250 | 250 |
251 import [-p <n> -b <base> -f] <patches>:: | 251 import [-p <n> -b <base> -f] <patches>:: |
252 Import a list of patches and commit them individually. | 252 Import a list of patches and commit them individually. |
253 | 253 |
254 If a patch looks like a mail message (its first line starts with | |
255 "From " or looks like an RFC822 header), it will not be applied | |
256 unless the -m option is used. The importer neither parses nor | |
257 discards mail headers, so use -m only to override the "mailness" | |
258 safety check, not to import a real mail message. | |
259 | |
254 options: | 260 options: |
255 -p, --strip <n> directory strip option for patch. This has the same | 261 -p, --strip <n> directory strip option for patch. This has the same |
256 meaning as the corresponding patch option | 262 meaning as the corresponding patch option |
257 -b <path> base directory to read patches from | 263 -b <path> base directory to read patches from |
258 -f, --force skip check for outstanding uncommitted changes | 264 -f, --force skip check for outstanding uncommitted changes |
265 -m, --mail-like apply a patch that appears to be a mail message | |
259 | 266 |
260 aliases: patch | 267 aliases: patch |
261 | 268 |
262 incoming [-p] [source]:: | 269 incoming [-p] [source]:: |
263 Show new changesets found in the specified repo or the default | 270 Show new changesets found in the specified repo or the default |