From: Marko Grönroos <magi@iki.fi>
Date: Tue, 7 Apr 2009 13:02:47 +0000 (+0000)
Subject: Fixed a subversion 1.5 compatibility problem in merge tool.
X-Git-Tag: 6.7.0.beta1~3022
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07203b799722834cf51ac667add85d495225ceba;p=vaadin-framework.git

Fixed a subversion 1.5 compatibility problem in merge tool.

svn changeset:7350/svn branch:6.0
---

diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py
index ef13448760..91d9d5105c 100755
--- a/build/bin/mergetool.py
+++ b/build/bin/mergetool.py
@@ -79,14 +79,12 @@ def listChangedFiles():
 	changed  = []
 	for line in lines:
 		# Remove trailing newline
-		line = line[:-1]
-
-		# Remove possible space character in the beginning of line
-		line = line.lstrip()
-
-		# Extract the file state and name
+		line = line.rstrip()
 		print line
-		(filestate, filename) = re.split(r'[ \+]+', line)
+		
+		# Extract the file state and name
+		filestate = line[0:2].strip()
+		filename  = line[7:].strip()
 
 		# Ignore files in build directory
 		if (filename.startswith("build/merge/") \
@@ -545,7 +543,8 @@ def commandRevert():
 		line = line[:-1]
 
 		# Extract the file state and name
-		(filestate, filename) = re.split(r'[ \+]+', line)
+		filestate = line[0:2].strip()
+		filename  = line[7:].strip()
 
 		# Ignore files in build directory
 		if (filename.startswith("build/merge/") \