问题描述
在Windows中，我可以使用 mercurial.ini 等将winmerge用作hg的外部差异工具.
使用一些您可以在网上找到的选项开关(我认为这是日本网站)反正这里例如:
in windows I am able to use winmerge as the external diff tool for hg using mercurial.ini,etc.
Using some options switch that you can find in web(I think it's a japanese website)Anyway, herefor example:
hg winmerge -r1 -r2将列出winmerge中rev1和rev2之间的文件更改.我可以点击要差异化的文件
will list file(s) change(s) between rev1 and rev2 in winmerge. I can just click which file to diff
但对于bc3:
hg bcomp -r1 -r2将使bc3打开一个对话框，指出找不到临时目录.
will make bc3 open a dialog which stated that a temp dir can't be found.
使用bc3和hg我最多能做的是
The most I can do using bc3 and hg is
hg bcomp -r1 -r2 myfile.cpp 这将打开myfile.cpp的rev1和rev2之间的差异
which will open diff between rev1 and rev2 of myfile.cpp
因此，似乎hg + bc3无法成功确认版本之间的所有文件更改.一次只能比较1个文件.
任何人都可以更好地使用bc3 + hg吗?
So,it seems that hg+bc3 can't successfully acknowledge of all files change between revision.Only able to diff 1 file at a time.
Anyone can use bc3 + hg better ?
edit:问题已解决！
edit: Problem Solved !
从http://www.scootersoftware.com/support.php?zz=kb_vcs.php>scooter支持页面获得解决方案.我必须使用 bcompare 而不是 bcomp 这是我的mercurial.ini的摘录
Got the solution from http://www.scootersoftware.com/support.php?zz=kb_vcs.php>scooter support page.I have to use bcompare instead of bcompHere's a snippet of my mercurial.ini
[extensions]
hgext.win32text =
;mhd adds
hgext.extdiff =
;mhd adds for bc
[extdiff]
cmd.bc3 = bcompare
opts.bc3 = /ro
;mhd adds for winmerge
;[extdiff]
;cmd.winmerge = WinMergeU
;opts.winmerge = /r /e /x /ub
推荐答案
Beyond-Compare-3是一个了不起的工具.我建议对设置进行一些调整:
Beyond-Compare-3 is an amazing tool.I recommend a few tweaks to the setup:
[extensions]
extdiff =
[extdiff]
cmd.bcomp = C:\Program Files\Beyond Compare 3\BCompare.exe
opts.bcomp = /leftreadonly
[merge-tools]
bcomp.executable = C:\Program Files\Beyond Compare 3\BComp
bcomp.args = /leftreadonly /centerreadonly $local $other $base $output
bcomp.priority = 1
[ui]
merge = bcomp
[tortoisehg]
authorcolor = True
vdiff = bcomp
这篇关于使用Mercurial和超越比较3(bc3)作为比较工具?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！