diff -r f0bfe42c7b1f -r 4fb1bafd43e7 mercurial/patch.py
--- a/mercurial/patch.py	Fri Apr 09 17:23:37 2010 -0500
+++ b/mercurial/patch.py	Sun Apr 11 20:59:55 2010 -0700
@@ -47,6 +47,9 @@
         if inheader and line[0] in (' ', '\t'):
             # continuation
             return True
+        if line[0] in (' ', '-', '+'):
+            # diff line - don't check for header pattern in there
+            return False
         l = line.split(': ', 1)
         return len(l) == 2 and ' ' not in l[0]