Show More
@@ -251,10 +251,13 b' identify::' | |||
|
251 | 251 | import [-p <n> -b <base> -f] <patches>:: |
|
252 | 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 | 257 | If a patch looks like a mail message (its first line starts with |
|
255 | 258 | "From " or looks like an RFC822 header), it will not be applied |
|
256 |
unless the - |
|
|
257 |
discards mail headers, so use - |
|
|
259 | unless the -f option is used. The importer neither parses nor | |
|
260 | discards mail headers, so use -f only to override the "mailness" | |
|
258 | 261 | safety check, not to import a real mail message. |
|
259 | 262 | |
|
260 | 263 | options: |
@@ -262,7 +265,6 b' import [-p <n> -b <base> -f] <patches>::' | |||
|
262 | 265 | meaning as the corresponding patch option |
|
263 | 266 | -b <path> base directory to read patches from |
|
264 | 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 | 269 | aliases: patch |
|
268 | 270 |
@@ -1029,7 +1029,7 b' def import_(ui, repo, patch1, *patches, ' | |||
|
1029 | 1029 | hgpatch = False |
|
1030 | 1030 | for line in file(pf): |
|
1031 | 1031 | line = line.rstrip() |
|
1032 |
if not message and mailre.match(line) and not opts[' |
|
|
1032 | if not message and mailre.match(line) and not opts['force']: | |
|
1033 | 1033 | if len(line) > 35: line = line[:32] + '...' |
|
1034 | 1034 | raise util.Abort('first line looks like a ' |
|
1035 | 1035 | 'mail header: ' + line) |
@@ -1683,8 +1683,7 b' table = {' | |||
|
1683 | 1683 | (import_, |
|
1684 | 1684 | [('p', 'strip', 1, 'path strip'), |
|
1685 | 1685 | ('f', 'force', None, 'skip check for outstanding changes'), |
|
1686 | ('b', 'base', "", 'base path'), | |
|
1687 | ('m', 'mail-like', None, 'apply a patch that looks like email')], | |
|
1686 | ('b', 'base', "", 'base path')], | |
|
1688 | 1687 | "hg import [-f] [-p NUM] [-b BASE] PATCH..."), |
|
1689 | 1688 | "incoming|in": (incoming, |
|
1690 | 1689 | [('p', 'patch', None, 'show patch')], |
General Comments 0
You need to be logged in to leave comments.
Login now