From: Marko Grönroos <magi@iki.fi>
Date: Tue, 31 Mar 2009 12:51:05 +0000 (+0000)
Subject: Fixed change list parsing problem in merge tool.
X-Git-Tag: 6.7.0.beta1~3041
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eb8f1883f376860c3a09cc711a8f4e0bba14d5e0;p=vaadin-framework.git

Fixed change list parsing problem in merge tool.

svn changeset:7252/svn branch:6.0
---

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