svn - 如何配置 TortoiseSVN 的外部合并行为？

Question

与 TortoiseSVN 合并后，我在运行冲突解决方案时遇到了一些麻烦。

我试图让它将数据发送到 BeyondCompare 并使用其 3 路合并功能。不幸的是，它以与 BeyondCompare 预期不同的顺序发送文件，因此合并全都出错了。

如果我在资源管理器中右键单击并说 TortoiseSVN->设置，然后在外部程序->合并工具下我可以指定 BeyondCompare 的路径，但没有关于参数的任何内容。我如何重新排序它发送到外部合并工具的参数，以便我可以在 BeyondCompare 中正确显示内容？

Answer 1

您可以通过 TortoiseSVN 在 BComp.exe 中控制发送到外部合并应用程序的参数(在本例中为 TortoiseSVN->Settings->Merge Tools )对话。

使用 BeyondCompare 进行双向和三向合并的示例在 BC support documentation 中。 :

3-way Merge (v3 Pro)

1.    Select Settings from Explorer's TortoisSVN submenu.
2.    Switch to the Merge Tool tab.
3.    Change the radio buttons from TortoiseMerge to External.
4.    In the path edits, enter:
5.    "C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname 

2-way Merge (v3 Std, v2)

Use the same steps as above, but use the command line:

`"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs /savetarget=%merged`

这在 Tortoise SVN docs 中有介绍, 节 4.30.5.2 (没有子主题的链接 - 在页面中搜索 Merge Tool ):

Parameter substitution is used in the same way as with the Diff Program.

%base - the original file without your or the others changes

%bname - The window title for the base file

%mine - your own file, with your changes

%yname - The window title for your file

%theirs - the file as it is in the repository

%tname - The window title for the file in the repository

%merged - the conflicted file, the result of the merge operation

%mname - The window title for the merged file

For example, with Perforce Merge:

C:\Path-To\P4Merge.exe %base %theirs %mine %merged

or with KDiff3:

C:\Path-To\kdiff3.exe %base %mine %theirs -o %merged
--L1 %bname --L2 %yname --L3 %tname

or with Araxis:

C:\Path-To\compare.exe /max /wait /3 /title1:%tname /title2:%bname
/title3:%yname %theirs %base %mine %merged /a2

or with WinMerge (2.8 or later): C:\Path-To\WinMerge.exe %merged