diff options
| author | Marko Grönroos <magi@iki.fi> | 2009-03-31 12:51:05 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2009-03-31 12:51:05 +0000 |
| commit | eb8f1883f376860c3a09cc711a8f4e0bba14d5e0 (patch) | |
| tree | e54ce6d5cd969b1c9bf6d0cc11f8a158b5887df5 /build/bin/mergetool.py | |
| parent | ed0b2bf73b4bec282fe97c0cf1b5d874ef01662e (diff) | |
| download | vaadin-framework-eb8f1883f376860c3a09cc711a8f4e0bba14d5e0.tar.gz vaadin-framework-eb8f1883f376860c3a09cc711a8f4e0bba14d5e0.zip | |
Fixed change list parsing problem in merge tool.
svn changeset:7252/svn branch:6.0
Diffstat (limited to 'build/bin/mergetool.py')
| -rwxr-xr-x | build/bin/mergetool.py | 4 |
1 files changed, 4 insertions, 0 deletions
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 |