标签:
前段时间决定将公司iOS项目组的版本控制工具Cornerstone换成TortoiseHg。用过Hg再用Connerstone就像身处在21世纪的我们回到改革开放前,种种的不适应。所以换换换....过了挺长时间,所以乘着现在有时间,写篇博客记录一下。
1. TortoiseHg下载地址:https://bitbucket.org/tortoisehg/files/downloads/TortoiseHg-3.2.4-mac-x64.zip
也可以直接进入官网下载最新mac版本的TortoiseHg
2. 安装好之后打开进入软件:文件--->设置
2.点击编辑文件,输入
[ui]
#用户名改为自己的 username = yusw [tortoisehg] ui.language = zh_CN vdiff = vdiff_bcomp editor = /Applications/Sublime\ Text.app/Contents/MacOS/Sublime\ Text #默认 可视化比对工具 需要在 tortoisehg.vdiff 里强制指定 [extdiff] #kdiff3 比对时,只读,无法编辑; cmd.vdiff_kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3 #Beyond Comare 比对时;可编辑; #要想每次能够正常比对,必须每次完全退出(Quit)APP才行 #This is the main application. Only one copy will run at a time, regardless of how many windows you have open. #If you launch a second copy it will tell the existing copy to start a comparison and exit immediately. #打开后不等待关闭,直接就返回了 cmd.vdiff_bcompare = /usr/local/bin/bcompare #Launch this program from a version control system #because it will wait for the comparison to complete before returning. #打开后,等待APP退出,才返回,特别是版本合并时,必须用这个命令 cmd.vdiff_bcomp = /usr/local/bin/bcomp #默认使用 优先级priority大的工具 [merge-tools] merge_kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3 merge_kdiff3.args = $base $local $other -o $output --L1 $base‘ [Base公共父版本]‘ --L2 $local‘ [Local本地版本]‘ --L3 $other‘ [Other别的版本]‘ merge_kdiff3.priority = 1 merge_bc.executable = /usr/local/bin/bcomp merge_bc.args = $base $other $local $output merge_bc.priority = 0 [mq] secret = True
3.上面编辑文件中已经配置好双击比对工具:kdiff3和Beyond Compare 及Sublime Text。工具在网上下载安装即可与TortoiseHg一起使用。
PS:如有问题请留言或关注我的新浪微博http://weibo.com/3216725234私信我!!!!
标签:
原文地址:http://www.cnblogs.com/ysw24/p/5129736.html