svn commit: r1934115 - subversion/trunk/tools/dist

Author: ivan
Date: Mon May 11 18:10:45 2026
New Revision: 1934115

Log:
Fix bug in detect-conflicting-backports.py: the script fails if there are
modified files with letter 'C' in the name.

* tools/dist/detect-conflicting-backports.py:
    Fix conflict matcher regular expression: match from line start.

Modified:
   subversion/trunk/tools/dist/detect-conflicting-backports.py

Modified: subversion/trunk/tools/dist/detect-conflicting-backports.py
==============================================================================
--- subversion/trunk/tools/dist/detect-conflicting-backports.py	Mon May 11 17:29:33 2026	(r1934114)
+++ subversion/trunk/tools/dist/detect-conflicting-backports.py	Mon May 11 18:10:45 2026	(r1934115)
@@ -86,7 +86,7 @@ for entry_para in sf.entries_paras():
     if backport.merger.svn_version() < (1,6):
       output = re.compile('^(......)', re.MULTILINE).sub(r'\1 ', output)
 
-    pattern = re.compile(r'(?:C......|.C.....|......C)\s(.*)', re.MULTILINE)
+    pattern = re.compile(r'^(?:C......|.C.....|......C)\s(.*)$', re.MULTILINE)
     conflicts = pattern.findall(output)
     if conflicts and not entry.depends:
       if len(conflicts) == 1: