使用Beyond Compare在linux下进行svn diff 和 svn merge.(更新 基于centos)
2012-05-16 09:30
218 查看
原文地址:http://www.scootersoftware.com/support.php?zz=kb_vcs#svn
beyond compare下载:http://www.scootersoftware.com/download.php
Diff:
创建文件命名为 "/usr/bin/bcdiff.sh".
bcdiff.sh
编辑"$HOME/.subversion/config" 并且加入 "diff-cmd = /usr/bin/bcdiff.sh".
chmod 755 /usr/bin/bcdiff.sh
Merge:
创建文件命名为 "/usr/bin/bcmerge.sh".
bcmerge.sh
编辑"$HOME/.subversion/config" 并且加入 "merge-tool-cmd = /usr/bin/bcmerge.sh".
chmod 755 /usr/bin/bcmerge.sh
Windows
Diff
Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 3).
Create a batch file named "bc3svn.bat" with one line:
Go into Subversion's per-user configuration area, typically
C:\Documents and Settings\<username>\Application Data\Subversion.
Edit "config" and change the following lines:
to:
Merge (v3 Pro)
Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 3).
Create a batch file named "bc3mer.bat" with one line:
Go into Subversion's per-user configuration area, typically
C:\Documents and Settings\<username>\Application Data\Subversion.
Edit "config" and change the following lines:
to:
Cygwin (http://www.cygwin.com/)
Instead of using a batch file, create a file named "bc.sh" with the following line:
Linux
Diff:
Create a file named /usr/bin/bcdiff.sh with the following line:
Edit "$HOME/.subversion/config" and add the line "diff-cmd = /usr/bin/bcdiff.sh".
Merge:
Create a file named /usr/bin/bcmerge.sh with the following line:
Edit "$HOME/.subversion/config" and add the line "merge-tool-cmd = /usr/bin/bcmerge.sh".
beyond compare下载:http://www.scootersoftware.com/download.php
Diff:
创建文件命名为 "/usr/bin/bcdiff.sh".
bcdiff.sh
#!/bin/bash /usr/bin/bcompare "$6" "$7" -title1="$3" -title2="$5" exit 0
编辑"$HOME/.subversion/config" 并且加入 "diff-cmd = /usr/bin/bcdiff.sh".
chmod 755 /usr/bin/bcdiff.sh
Merge:
创建文件命名为 "/usr/bin/bcmerge.sh".
bcmerge.sh
#!/bin/bash /usr/bin/bcompare "$2" "$3" "$1" "$4" exit 0
编辑"$HOME/.subversion/config" 并且加入 "merge-tool-cmd = /usr/bin/bcmerge.sh".
chmod 755 /usr/bin/bcmerge.sh
Using Beyond Compare with Version Control Systems
SubversionWindows
Diff
Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 3).
Create a batch file named "bc3svn.bat" with one line:
"C:\Progra~1\Beyond~1\bcomp.exe" "%6" /title1=%3 "%7" /title2=%5
Go into Subversion's per-user configuration area, typically
C:\Documents and Settings\<username>\Application Data\Subversion.
Edit "config" and change the following lines:
# [helpers]
# diff-cmd = diff_program (diff, gdiff, etc.)
to:
[helpers]
diff-cmd = C:\Progra~1\Beyond~1\bc3svn.bat
Merge (v3 Pro)
Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 3).
Create a batch file named "bc3mer.bat" with one line:
"C:\Progra~1\Beyond~1\bcomp.exe" "%2" "%3" "%1" "%4"
Go into Subversion's per-user configuration area, typically
C:\Documents and Settings\<username>\Application Data\Subversion.
Edit "config" and change the following lines:
# [helpers]
# merge-tool-cmd = merge_program
to:
[helpers]
merge-tool-cmd = C:\Progra~1\Beyond~1\bc3mer.bat
Cygwin (http://www.cygwin.com/)
Instead of using a batch file, create a file named "bc.sh" with the following line:
"$(cygpath 'C:\Progra~1\Beyond~1\bcomp.exe')" `cygpath -w "$6"` `cygpath -w "$7"` /title1="$3" /title2="$5" /readonly
Linux
Diff:
Create a file named /usr/bin/bcdiff.sh with the following line:
/usr/bin/bcompare "$6" "$7" -title1="$3" -title2="\"$5\"" -readonly exit 0
Edit "$HOME/.subversion/config" and add the line "diff-cmd = /usr/bin/bcdiff.sh".
Merge:
Create a file named /usr/bin/bcmerge.sh with the following line:
/usr/bin/bcompare "$2" "$3" "$1" "$4"
Edit "$HOME/.subversion/config" and add the line "merge-tool-cmd = /usr/bin/bcmerge.sh".
相关文章推荐
- linux(centos)如何使用svn进行多个版本库的配置
- linux(centos)如何使用svn进行多个版本库的配置
- Linux使用yum进行软件安装和更新
- Linux(CentOS)下SVN命令使用实例(未完待续)
- linux中使用svn更新站点
- AndroidStudio使用SVN进行代码的检出,更新和提交
- 使用Linux(CentOS)搭建SVN服务器全攻略
- Linux(CentOS 7.0)下使用yum安装配置和使用svn.
- 使用VM虚拟机安装Linux操作系统,并完成JDK配置(基于CentOS 7)
- 使用XILINX SDK工具通过网络进行基于linux系统的远程调试方法
- androidStudio中使用svn进行代码的更新和提交
- 使用Linux(CentOS)搭建SVN服务器
- CentOS 7 更新源 – 使用国内 163 yum 源 [日期:2015-09-22] 来源:imcn.me 作者:Linux [字体:大 中 小] 突然想起试试 Docker,在一台计算机上
- 使用Linux(CentOS)搭建SVN服务器全攻略
- 使用Linux(CentOS)搭建SVN服务器全攻略
- Linux Nginx Centos 下使用 ab 工具 进行压力测试
- Linux(centos)下SVN服务器的搭建及简单配置和使用
- CentOS(Linux) SVN服务器搭建+同步更新+多版本库+开机启动
- Linux(CentOS)+SVN服务器,并实现本地提交后,服务器端自动更新
- Linux(centos)下SVN服务器的搭建及简单配置和使用