Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/commands.py @ 2743:a31f0f2997e9

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 christian ebert says his mailer was broken.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 31 Jul 2006 12:02:13 -0700
parents ae5ce3454ef5
children 6c2c10cedf7a
line wrap: on
line diff
--- 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)