Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 19 Mar 2010 16:05:16 -0500
changeset 10744 d794ea113834
parent 10743 5303b56eabc9 (current diff)
parent 10742 0e8403f4ce31 (diff)
child 10746 16b9aa398c28
Merge with stable
mercurial/patch.py file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Fri Mar 19 16:04:49 2010 -0500
+++ b/mercurial/patch.py	Fri Mar 19 16:05:16 2010 -0500
@@ -178,8 +178,8 @@
     # (this heuristic is borrowed from quilt)
     diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |'
                         r'retrieving revision [0-9]+(\.[0-9]+)*$|'
-                        r'(---|\*\*\*)[ \t].*?'
-                        r'^(\+\+\+|\*\*\*)[ \t])', re.MULTILINE|re.DOTALL)
+                        r'---[ \t].*?^\+\+\+[ \t]|'
+                        r'\*\*\*[ \t].*?^---[ \t])', re.MULTILINE|re.DOTALL)
 
     fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
     tmpfp = os.fdopen(fd, 'w')
mercurial