diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-04-20 05:52:38 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-04-20 05:52:38 +0000 |
| commit | c2a6543cbf31109a73166908cef09cc607d2a403 (patch) | |
| tree | d1b93a3e0327cb3bbfd4310f1dc58ca4276ad496 /build/bin | |
| parent | 2bd4106c653cf87e63532977d43c787288cf4918 (diff) | |
| download | vaadin-framework-c2a6543cbf31109a73166908cef09cc607d2a403.tar.gz vaadin-framework-c2a6543cbf31109a73166908cef09cc607d2a403.zip | |
Merged all 5.4 build script and testing tools related changes to 6.0
svn changeset:7462/svn branch:6.0
Diffstat (limited to 'build/bin')
| -rwxr-xr-x | build/bin/mergetool.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py index 91d9d5105c..7ed1cb1579 100755 --- a/build/bin/mergetool.py +++ b/build/bin/mergetool.py @@ -79,12 +79,10 @@ def listChangedFiles(): changed = [] for line in lines: # Remove trailing newline - line = line.rstrip() - print line - + line = line[:-1] + # Extract the file state and name - filestate = line[0:2].strip() - filename = line[7:].strip() + (filestate, filename) = re.split(r'[ \+]+', line) # Ignore files in build directory if (filename.startswith("build/merge/") \ @@ -543,8 +541,7 @@ def commandRevert(): line = line[:-1] # Extract the file state and name - filestate = line[0:2].strip() - filename = line[7:].strip() + (filestate, filename) = re.split(r'[ \+]+', line) # Ignore files in build directory if (filename.startswith("build/merge/") \ |