Mercurial > hg

changeset 12045:1e8c7999af86

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 bcc7139521b7
children dee1901a0ed8
files mercurial/filemerge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Wed Aug 25 16:55:54 2010 -0500
+++ 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