# HG changeset patch # User Vadim Gelfer # Date 1154319846 25200 # Node ID 42a02b5773d4cf63a45d75414d487a78f648d196 # Parent 0bcecf7d45b1f7a2968cb75ac5668fe0eacf3275 import: allow application/x-patch for funny patch from christian ebert diff -r 0bcecf7d45b1 -r 42a02b5773d4 mercurial/commands.py --- a/mercurial/commands.py Sat Jul 29 10:27:54 2006 +0200 +++ b/mercurial/commands.py Sun Jul 30 21:24:06 2006 -0700 @@ -1751,7 +1751,7 @@ 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)