如何配置TortoiseSVN以使用Visual Studio 2012进行差异？

Question

我想使用新的Visual Studio diffing工具通过TortoiseSVN来改变变化.我在外部工具命令行框中输入什么内容？

Answer 1

你可以vsDiffMerge.exe用来做这件事.

Visual Studio 2012

DIFF:

"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsDiffMerge.exe" /t %base %mine %bname %yname

合并:

"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsDiffMerge.exe" /m %theirs %mine %base %merged

Visual Studio 2013和2014

只需识别版本号,然后将12.0您想要的内容替换为上述命令即可.(经2015年测试,14.0.)

Visual Studio 2017

DIFF:

"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe" /t %base %mine %bname %yname

合并:

"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe" /m %theirs %mine %base %merged

参考

vsDiffMerge.exe用法

看到这里和这里.

TortoiseSVN命令替换

• TortoiseSVN diff命令替换
• TortoiseSVN合并命令替换

Answer 2

用这个:

C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.exe -diff %base %mine

取自TortoiseSVN手册,该手册显示页面中间的%paramNames.

http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.html#tsvn-dug-settings-progs