Mercurial合并执行程序脚本

我如何配置Mercurial以在两个头冲突且需要一个人的merguing时弹出merguing程序

我在Visual Studio中使用Mercurial和HgSccPackage。 用于使用Devart的CodeCompare合并和比较im

日志显示：

[Pull started]

pulling from http://localhost:8000/
[Error: warning: conflicts during merge.]
searching for changes
[Error: merging JackPot/JackPotViewer/Application/FrameRender.cpp incomplete! (edit conflicts,       then use 'hg resolve --mark')]
all local heads known remotely
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
resolving manifests
calling hook preupdate.eol: <function preupdate at 0x023DA4F0>
couldn't find merge tool codecompare_merge
couldn't find merge tool codecompare_merge
couldn't find merge tool ecmerge
couldn't find merge tool filemerge
couldn't find merge tool gpyfm
couldn't find merge tool kdiff3
couldn't find merge tool meld
couldn't find merge tool bcompare
couldn't find merge tool UltraCompare
couldn't find merge tool araxis
couldn't find merge tool beyondcompare3
couldn't find merge tool diffuse
couldn't find merge tool diffmerge
couldn't find merge tool p4merge
couldn't find merge tool tkdiff
couldn't find merge tool tortoisemerge
couldn't find merge tool xxdiff
couldn't find merge tool gvimdiff
couldn't find merge tool vimdiff
couldn't find merge tool winmerge
couldn't find merge tool merge
couldn't find merge tool hgmerge
merging JackPot/JackPotViewer/Application/FrameRender.cpp
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges

[Operation completed. Exit code: 1]

[拉入启动]
退出http://localhost:8000/
[错误：警告：合并期间发生冲突。]
搜索更改
[错误：合并JackPot/JackPotViewer/Application/FrameRender.cpp不完整！（编辑冲突，然后使用'hg resolve--mark'）]
所有本地头目都是远程知道的
添加变更集
添加舱单
添加文件更改
添加了1个变更集，其中1个变更包含1个文件
解析清单
调用hook preupdate.eol：
找不到合并工具codecompare\u merge
找不到合并工具codecompare\u merge
找不到合并工具ecmerge
找不到合并工具filemerge
找不到合并工具gpyfm
找不到合并工具kdiff3
找不到合并工具meld
找不到合并工具bcompare
找不到合并工具UltraCompare
找不到合并工具araxis
在Compare3之外找不到合并工具
找不到合并工具
找不到合并工具diffmerge
找不到合并工具p4merge
找不到合并工具tkdiff
找不到合并工具
找不到合并工具xxdiff
找不到合并工具gvimdiff
找不到合并工具vimdiff
找不到合并工具winmerge
找不到合并工具合并
找不到合并工具hgmerge
合并JackPot/JackPotViewer/Application/FrameRender.cpp
0个文件已更新，0个文件已合并，0个文件已删除，1个文件未解析
使用“hg resolve”重试未解析的文件合并
[操作已完成。退出代码：1]

我的Mercurial.ini是：

[ui]
username=diego martinez <diego.martinez@pictel.es>
ignore=C:\Users\diego\Documents\hgignore_global.txt
merge=codecompare_merge

[extensions]
eol=
extdiff=

[merge-tools]
codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
codecompare_merge.regname=InstallLocation
codecompare_merge.regappend=CodeMerge.exe
codecompare_merge.args=/SC=Hg /TF=$other /MF=$local /RF=$output /BF=$base /TT="Other: $other"     /MT="Local: $local" /RT="Output: $output" /BT="Base: $base"
codecompare_merge.binary=False
codecompare_merge.gui=True
codecompare_merge.checkconflicts=True
codecompare_merge.premerge=Keep


[extdiff]
cmd.codecompare=C:\Program Files\Devart\Code Compare\CodeCompare.exe
opts.codecompare=/SC=Hg /W /title1="$plabel1" /title2="$clabel" $parent $child

[merge-patterns]
*.*=codecompare_merge

[http_proxy]
host=
no=
user=
passwd=

[ui]
用户名=迭戈·马丁内斯
ignore=C:\Users\diego\Documents\hgignore\u global.txt
merge=codecompare\u merge
[延期]
下线=
extdiff=
[合并工具]
codecompare\u merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\codecompare\u is1
codecompare\u merge.regname=InstallLocation
codecompare\u merge.regappend=CodeMerge.exe
codecompare\u merge.args=/SC=Hg/TF=$other/MF=$local/RF=$output/BF=$base/TT=“other:$other”/MT=“local:$local”/RT=“output:$output”/BT=“base:$base”
codecompare\u merge.binary=False
codecompare\u merge.gui=True
codecompare\u merge.checkconflicts=True
codecompare\u merge.premerge=Keep
[extdiff]
cmd.codecompare=C:\Program Files\Devart\Code Compare\codecompare.exe
opts.codecompare=/SC=Hg/W/title1=“$plabel1”/title2=“$clabel”$parent$child
[合并模式]
**=codecompare\u merge
[http_proxy]
主人=
没有=
使用者=
passwd=

在您的设置中，您定义了两个工具，但仅成功指定了其中一个工具的路径

您已将

codecompare

定义为外部差异工具。当您尝试查看文件的两个版本之间的差异时，我假设它工作正常，例如，

hg codecompare-r“tip^:tip”file.txt

第二个工具是

codecompare\u merge

，您已使用一组密钥定义了安装位置：

codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
codecompare_merge.regname=InstallLocation
codecompare_merge.regappend=CodeMerge.exe

这告诉hg在注册表中的

HKEY\U CURRENT\U USER

（然后是

HKEY\U LOCAL\U MACHINE

）中查找regkey

安装位置

，然后将

CodeMerge.exe

附加到注册表中以获取可执行路径。我的猜测是那里有个错误

您应该能够用以下内容替换这三个设置，以匹配

diff

部分中的设置：

codecompare_merge.executeable=C:\Program Files\Devart\Code Compare\CodeCompare.exe

---

查看Selenic站点。

当我执行：hg codecompare-r“tip^：tip”file.txt时，什么都不会发生