# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 2006-07-31 04:24:06
# Node ID 42a02b5773d4cf63a45d75414d487a78f648d196
# Parent  0bcecf7d45b1f7a2968cb75ac5668fe0eacf3275

import: allow application/x-patch for funny patch from christian ebert

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1751,7 +1751,7 @@ def import_(ui, repo, patch1, *patches, 
             if user:
                 ui.debug('From: %s\n' % user)
             diffs_seen = 0
-            ok_types = ('text/plain', 'text/x-patch')
+            ok_types = ('application/x-patch', 'text/plain', 'text/x-patch')
             for part in msg.walk():
                 content_type = part.get_content_type()
                 ui.debug('Content-Type: %s\n' % content_type)