Index: rietveld.py |
diff --git a/rietveld.py b/rietveld.py |
index 037640c6abf8e0100f3630f7ef3436b198c0363a..5d6804174f8b1c7c8b2911b98baae287fc0c4746 100644 |
--- a/rietveld.py |
+++ b/rietveld.py |
@@ -198,7 +198,8 @@ class Rietveld(object): |
match = re.match(r'^(\w+): (.+)$', action) |
if not match or not rietveld_svn_props: |
raise patch.UnsupportedPatchFormat( |
- filename, 'Failed to parse svn properties.') |
+ filename, |
+ 'Failed to parse svn properties: %s, %s' % (action, svn_props)) |
if match.group(2) == 'svn:mergeinfo': |
# Silently ignore the content. |
@@ -210,7 +211,7 @@ class Rietveld(object): |
raise patch.UnsupportedPatchFormat( |
filename, 'Unsupported svn property operation.') |
- if match.group(2) in ('svn:eol-style', 'svn:executable'): |
+ if match.group(2) in ('svn:eol-style', 'svn:executable', 'svn:mime-type'): |
# ' + foo' where foo is the new value. That's fragile. |
content = rietveld_svn_props.pop(0) |
match2 = re.match(r'^ \+ (.*)$', content) |