Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/hg.1.txt @ 1211:1c455338ad95
Fold import -m option into import -f
author | mpm@selenic.com |
---|---|
date | Wed, 07 Sep 2005 20:09:16 -0700 |
parents | 6e165de907c5 |
children | ccb6201e3f28 |
comparison
equal
deleted
inserted
replaced
1210:27f2ec705332 | 1211:1c455338ad95 |
---|---|
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 there are outstanding changes in the working directory, import | |
255 will abort unless given the -f flag. | |
256 | |
254 If a patch looks like a mail message (its first line starts with | 257 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 | 258 "From " or looks like an RFC822 header), it will not be applied |
256 unless the -m option is used. The importer neither parses nor | 259 unless the -f option is used. The importer neither parses nor |
257 discards mail headers, so use -m only to override the "mailness" | 260 discards mail headers, so use -f only to override the "mailness" |
258 safety check, not to import a real mail message. | 261 safety check, not to import a real mail message. |
259 | 262 |
260 options: | 263 options: |
261 -p, --strip <n> directory strip option for patch. This has the same | 264 -p, --strip <n> directory strip option for patch. This has the same |
262 meaning as the corresponding patch option | 265 meaning as the corresponding patch option |
263 -b <path> base directory to read patches from | 266 -b <path> base directory to read patches from |
264 -f, --force skip check for outstanding uncommitted changes | 267 -f, --force skip check for outstanding uncommitted changes |
265 -m, --mail-like apply a patch that appears to be a mail message | |
266 | 268 |
267 aliases: patch | 269 aliases: patch |
268 | 270 |
269 incoming [-p] [source]:: | 271 incoming [-p] [source]:: |
270 Show new changesets found in the specified repo or the default | 272 Show new changesets found in the specified repo or the default |