diff -r 56582bb2b869 -r 8baa29e36b14 mercurial/commands.py
--- a/mercurial/commands.py	Thu Sep 08 10:49:33 2005 -0700
+++ b/mercurial/commands.py	Thu Sep 08 12:10:43 2005 -0700
@@ -1049,7 +1049,8 @@
         hgpatch = False
         for line in file(pf):
             line = line.rstrip()
-            if not message and mailre.match(line) and not opts['force']:
+            if (not message and not hgpatch and
+                   mailre.match(line) and not opts['force']):
                 if len(line) > 35: line = line[:32] + '...'
                 raise util.Abort('first line looks like a '
                                  'mail header: ' + line)