svn配置外部的比较工具

第一种方式是直接命令行中指定：

D:/workbench/test/testrep>svn diff --diff-cmd="D:/ProgramFiles/IDM Computer Solutions/UE
Studio/uestudio.exe" -r 1:20 src/parameter.properties

 

第二种方式是在%APPDATA%/subversion/config文件中配置，配置内容如下：

 

diff-cmd =D:/svn_repository/DIFF.BAT

 

DIFF.BAT内容如下：

@ECHO OFF

REM Configure your favorite diff program here.
SET DIFF="D:/ProgramFiles/IDM Computer Solutions/UEStudio/ucl.exe"

REM Subversion provides the paths we need as the sixth and seventh
REM parameters.
SET LEFT=%6
SET RIGHT=%7

REM Call the diff command (change the following line to make sense for
REM your merge program).
%DIFF% --left %LEFT% --right %RIGHT%

REM Return an errorcode of 0 if no differences were detected, 1 if some were.
REM Any other errorcode will be treated as fatal.