I met an error when using kdiff3 as the merge tool for subversion. I suspect this is an bug of svn.
How to repeat the error:
1. either set --diff-cmd in ~/.subversion/config or in the command line directly like "svn diff -r r1507:r1508 blablabla.tex --diff-cmd /usr/bin/kdiff3"
2. then get the error as following:
kdiff3: Unknown option 'u'.
kdiff3: Use --help to get a list of available command line options.
svn: '/usr/bin/kdiff3' returned 254
svn: Error reading spooled REPORT request response
It could be caused that svn pass the default "-u" for "-x" to kdiff3 which doesn't recognize these parametres.
No comments:
Post a Comment