当前位置：文江博客话题详情

hg 与 BeyondCompare 合并 - 如何标记为合并

发布于 2025-01-08 18:35:43 字数 73 浏览 0 评论 0原文

如何使用 BeyondCompare3 将合并标记为已解决。在底部窗格中，我选择文件名并保存然后退出，但是 hg 总是显示合并失败？

原文

分享到QQ

分享到微博

如果你对这篇内容有疑问，欢迎到本站社区发帖提问参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。

发布评论

需要登录才能够评论，你可以免费注册一个本站的账号。

桃气十足 2025-01-15 18:35:44

在底部窗格中保存输出后，该文件应自动标记为已解决。（您不需要选择文件名，因为它应该从一开始就指向正确的位置。）

您是否有可能将 BeyondCompare 错误配置为合并工具？这是配置文件的相关部分，它始终对我有用：

[ui]
merge = beyondcompare3

[extensions]
extdiff=

[extdiff]
md.beyondcompare3 = c:\Program Files (x86)\Beyond Compare 3\BCompare.exe
opts.beyondcompare3 = /leftreadonly

[merge-tools]
; Windows version of BeyondCompare 3
beyondcompare3.priority=-1
beyondcompare3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=local /centertitle=base /righttitle=other /outputtitle=merged /automerge /reviewconflicts /solo
beyondcompare3.premerge=False
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath
beyondcompare3.gui=True
beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
beyondcompare3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
beyondcompare3.dirdiff=True
beyondcompare3.binary=True

[tortoisehg]
vdiff = beyondcompare3

The file should be automatically marked as resolved once you saved output in the bottom pane. (You don't need to select filename as it should be point to the right place from the beginning.)

Any chance you might have misconfigured BeyondCompare as a merge tool? Here is a relevant part of the configuration file which always work for me:

[ui]
merge = beyondcompare3

[extensions]
extdiff=

[extdiff]
md.beyondcompare3 = c:\Program Files (x86)\Beyond Compare 3\BCompare.exe
opts.beyondcompare3 = /leftreadonly

[merge-tools]
; Windows version of BeyondCompare 3
beyondcompare3.priority=-1
beyondcompare3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=local /centertitle=base /righttitle=other /outputtitle=merged /automerge /reviewconflicts /solo
beyondcompare3.premerge=False
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath
beyondcompare3.gui=True
beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
beyondcompare3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
beyondcompare3.dirdiff=True
beyondcompare3.binary=True

[tortoisehg]
vdiff = beyondcompare3

回复收藏 0 原文

~没有更多了~