diff options
| author | Marko Grönroos <magi@iki.fi> | 2009-04-07 13:02:47 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2009-04-07 13:02:47 +0000 |
| commit | 07203b799722834cf51ac667add85d495225ceba (patch) | |
| tree | ed41195d285cf4b2d24456317440c99991bfd947 /build/bin | |
| parent | 5e4b93244dfa30003ee75f7125b068b5a7901283 (diff) | |
| download | vaadin-framework-07203b799722834cf51ac667add85d495225ceba.tar.gz vaadin-framework-07203b799722834cf51ac667add85d495225ceba.zip | |
Fixed a subversion 1.5 compatibility problem in merge tool.
svn changeset:7350/svn branch:6.0
Diffstat (limited to 'build/bin')
| -rwxr-xr-x | build/bin/mergetool.py | 15 |
1 files changed, 7 insertions, 8 deletions
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/") \ |