用beyondcompare来diff SVN中的代码

1. 建立脚本文件mydiff.sh.

      在目录~/.subversions/下,新建脚本文件 mydiff.sh, 内容如下: 

#!/bin/sh

# Configure your favorite diff program here.
DIFF="/usr/bin/bcompare"
# DIFF="/usr/bin/meld"
# DIFF="/usr/bin/kompare"
# DIFF=env LANG=zh_CN.UTF-8 WINEPREFIX="/home/borqs/.wine" wine "C:\\Program Files\\Beyond Compare 2\\BC2.exe"

# Subversion provides the paths we need as the sixth and seventh 
# parameters.
LEFT=${6}
RIGHT=${7}

# Call the diff command (change the following line to make sense for
# your merge program).
$DIFF $LEFT $RIGHT 

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


并给其添加可执行权限.



2. 修改config文件.

修改目录~/.subversions/下的文件config, 加入如下一行:

diff-cmd = /home/zzq/.subversion/mydiff.sh





你可能感兴趣的:(c,SVN,脚本,command,subversion,merge)