From eb8f1883f376860c3a09cc711a8f4e0bba14d5e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marko=20Gr=C3=B6nroos?= Date: Tue, 31 Mar 2009 12:51:05 +0000 Subject: [PATCH] Fixed change list parsing problem in merge tool. svn changeset:7252/svn branch:6.0 --- build/bin/mergetool.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py index 7ed1cb1579..ef13448760 100755 --- a/build/bin/mergetool.py +++ b/build/bin/mergetool.py @@ -81,7 +81,11 @@ def listChangedFiles(): # Remove trailing newline line = line[:-1] + # Remove possible space character in the beginning of line + line = line.lstrip() + # Extract the file state and name + print line (filestate, filename) = re.split(r'[ \+]+', line) # Ignore files in build directory -- 2.39.5