Ubuntu下使用bcompare进行svn文件diff处理

如果有在ubuntu下使用svn的朋友应该知道,其默认的diff工具相当难用。虽然可以使用colordiff来替代diff,但还是不如使用bcompare来的方便。那能不能使用beyond compare作为其默认的对比工具呢?当然可以!

1、首先下载并安装Beyond compare。可在下面网站下载linux版本

http://www.scootersoftware.com/download.php

2、安装svn

3、进入.subversion文件夹,新建两个.sh文件

   bc2.sh

   

#!/bin/sh

# Configure your favorite diff program here.
DIFF=bcompare

# 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 $LEFT --right $RIGHT

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

bc3.sh

#!/bin/sh

# Configure your favorite diff3/merge program here.
DIFF3=bcompare
# Subversion provides the paths we need as the ninth, tenth, and eleventh 
# parameters.
MINE=${9}
OLDER=${10}
YOURS=${11}

# Call the merge command (change the following line to make sense for
# your merge program).
$DIFF3 --older $OLDER --mine $MINE --yours $YOURS

# After performing the merge, this script needs to print the contents
# of the merged file to stdout.  Do that in whatever way you see fit.
# Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
# remain in the result.  Any other errorcode will be treated as fatal.
将两个批处理文件改变为可执行状态。

4、修改.subversion/config文件

[helpers]中添加如下两句

diff-cmd = /home/xxx/.subversion/bc2.sh                                                                                                                      
diff3-cmd = /home/xxx/.subversion/bc3.sh

OK

当然,也可以将bcompare改为其他对比工具,例如meld等。




阅读更多
个人分类: Android
想对作者说点什么? 我来说一句

没有更多推荐了,返回首页

加入CSDN,享受更精准的内容推荐,与500万程序员共同成长!
关闭
关闭