问题描述
如何配置Perforce以使用工具TortoiseMerge进行差异和合并?
How can I configure Perforce to use the tool TortoiseMerge for diff and merging?
我尝试过争论
/base:%1 /mine:%2
跟随 http://tortoisesvn.net/docs/release/TortoiseMerge_en/tme-automation.html 和>: //www.perforce.com/perforce/doc.current/manuals/p4v/Configuring_display_preferences.html#Diff . Perforce文档说
following http://tortoisesvn.net/docs/release/TortoiseMerge_en/tme-automation.html and http://www.perforce.com/perforce/doc.current/manuals/p4v/Configuring_display_preferences.html#Diff . The Perforce docs say
但是，当我尝试该操作时，TortoiseMerge错误无法打开文件％1"，表明P4V并未替换参数，并保留了%1
Yet when I try it, TortoiseMerge errors "Can't open file %1" suggesting P4V didn't replace the arguments and left %1 as is
推荐答案
可悲的是，P4V的参数替换已损坏.您可以使用TortoiseMerge进行差异化，但不能合并.
Sadly P4V's argument replacement is broken. You can use TortoiseMerge for diffing, but not merging.
要设置用于差异化的TortoiseMerge，请使用参数字符串%1 %2
To set up TortoiseMerge for diffing, use the argument string %1 %2
正确的合并参数为
/base:%b /theirs:%1 /mine:%2 /merged:%r
但是它给出了这个错误
大概是由于P4V无法用适当的文件路径替换/base:%b中的'％b'.
Presumably what's happening is that P4V fails to replace the '%b' in /base:%b with the appropriate file path.
这篇关于如何从Perforce P4V使用TortoiseMerge?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！