forked from len0rd/rockbox
Added -b to diff command
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@666 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
ed83f28e93
commit
6ec42d93cb
1 changed files with 1 additions and 1 deletions
|
@ -115,7 +115,7 @@ def calculate_diff(filespec, contextlines):
|
||||||
difftype = "-C " + str(contextlines)
|
difftype = "-C " + str(contextlines)
|
||||||
else:
|
else:
|
||||||
difftype = "-uN"
|
difftype = "-uN"
|
||||||
diffcmd = '/usr/bin/cvs -f diff -kk %s -r %s -r %s %s' % (
|
diffcmd = '/usr/bin/cvs -f diff -kk %s -b -r %s -r %s %s' % (
|
||||||
difftype, oldrev, newrev, file)
|
difftype, oldrev, newrev, file)
|
||||||
fp = os.popen(diffcmd)
|
fp = os.popen(diffcmd)
|
||||||
lines = fp.readlines()
|
lines = fp.readlines()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue