Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: switch from application/x-patch to text/x-diff
authorVadim Gelfer <vadim.gelfer@gmail.com>
Mon, 31 Jul 2006 12:02:13 -0700
changeset 2743 a31f0f2997e9
parent 2742 2f13f8d3fe80
child 2744 b5779a04f208
import: switch from application/x-patch to text/x-diff christian ebert says his mailer was broken.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1777,7 +1777,7 @@ def import_(ui, repo, patch1, *patches, 
             if user:
                 ui.debug('From: %s\n' % user)
             diffs_seen = 0
-            ok_types = ('application/x-patch', 'text/plain', 'text/x-patch')
+            ok_types = ('text/plain', 'text/x-diff', 'text/x-patch')
             for part in msg.walk():
                 content_type = part.get_content_type()
                 ui.debug('Content-Type: %s\n' % content_type)
mercurial-crew-with-dirclash