diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2003-06-11 14:48:27 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2003-06-11 14:48:27 +0000 |
| commit | bc2eac429c1b8ab4dc7ff689fc73194d3b5043e0 (patch) | |
| tree | 5721862ceb68edadd24894c68cd8367889869b70 /tools/cvsdiff-fix.py | |
| parent | ad37ffa69b5f90e6d9d8d401d419102154d3a787 (diff) | |
| download | wireshark-bc2eac429c1b8ab4dc7ff689fc73194d3b5043e0.tar.gz | |
Handle diff lines that look like "Binary files".
svn path=/trunk/; revision=7841
Diffstat (limited to 'tools/cvsdiff-fix.py')
| -rwxr-xr-x | tools/cvsdiff-fix.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/cvsdiff-fix.py b/tools/cvsdiff-fix.py index e2e0c7c99f..91a648a4bd 100755 --- a/tools/cvsdiff-fix.py +++ b/tools/cvsdiff-fix.py @@ -6,7 +6,7 @@ # recursive diff, and unflattens it so that it can be # applied correctly with "patch". # -# $Id: cvsdiff-fix.py,v 1.2 2001/11/13 23:55:41 gram Exp $ +# $Id: cvsdiff-fix.py,v 1.3 2003/06/11 14:48:27 gram Exp $ # # Copyright (C) 2001 by Gilbert Ramirez <gram@alumni.rice.edu> # @@ -90,6 +90,10 @@ for line in input.readlines(): state = 2 elif state == 2: + if line.find("Binary files") == 0: + state = 0 + continue + match = re_from.search(line) if match: new_line = "--- %s\\g<after>" % (pathname) |