Mercurial > hg

diff mercurial/filemerge.py @ 12046:8e7960feb139 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Aug 2010 17:38:43 +0200
parents fad5ed0ff997
children dee1901a0ed8
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat Aug 21 22:48:14 2010 -0400
+++ b/mercurial/filemerge.py	Thu Aug 26 17:38:43 2010 +0200
@@ -225,7 +225,8 @@
 
     if not r and (_toolbool(ui, tool, "checkconflicts") or
                   'conflicts' in _toollist(ui, tool, "check")):
-        if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()):
+        if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),
+                     re.MULTILINE):
             r = 1
 
     checked = False