diff -r b169ba60eebe -r f78eadbb5769 mercurial/patch.py
--- a/mercurial/patch.py	Tue May 05 10:29:34 2009 +0200
+++ b/mercurial/patch.py	Wed May 20 00:43:23 2009 +0200
@@ -870,7 +870,7 @@
             current_hunk = None
             gitworkdone = False
         if ((sourcefile or state == BFILE) and ((not context and x[0] == '@') or
-            ((context or context == None) and x.startswith('***************')))):
+            ((context is not False) and x.startswith('***************')))):
             try:
                 if context == None and x.startswith('***************'):
                     context = True