blocks|key|3905758|text|遗憾的是，P4V的论点被取代了。您可以使用TortoiseMerge进行差分，但不能进行合并。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3905759|若要设置用于扩散的TortoiseMerge，请使用参数字符串%251+%252|offset|length|style|CODE|3905760|​|3905761|📷|atomic|3905762|3905763|合并的正确参数是|3905764|/base:%25b+/theirs:%251+/mine:%252+/merged:%25r|code-block|syntax|javascript|3905765|然而，它给出了这个错误。|3905766|3905767|3905768|3905769|可能发生的情况是，P4V未能用适当的文件路径替换/base:%25b中的'%25b‘。|3905770|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://developer.qcloudimg.com/http-save/yehe-900000/44dc1cf3ced95f3127f21e18ea92aa0c.png|imageAlt|1|https://developer.qcloudimg.com/http-save/yehe-900000/eccdcb625c31883843a5bd87a9795365.png^0|0|V|5|0|0|0|1|0|0|0|0|0|0|0|0|1|1|0|0|O|8|0^^$0|@$1|2|3|4|5|6|7|1C|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1D|8|@$D|1E|E|1F|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|1G|8|@]|9|@]|A|$]]|$1|J|3|K|5|L|7|1H|8|@]|9|@$D|1I|E|1J|1|1K]]|A|$]]|$1|M|3|I|5|6|7|1L|8|@]|9|@]|A|$]]|$1|N|3|O|5|6|7|1M|8|@]|9|@]|A|$]]|$1|P|3|Q|5|R|7|1N|8|@]|9|@]|A|$S|T]]|$1|U|3|V|5|6|7|1O|8|@]|9|@]|A|$]]|$1|W|3|I|5|6|7|1P|8|@]|9|@]|A|$]]|$1|X|3|K|5|L|7|1Q|8|@]|9|@$D|1R|E|1S|1|1T]]|A|$]]|$1|Y|3|I|5|6|7|1U|8|@]|9|@]|A|$]]|$1|Z|3|10|5|6|7|1V|8|@$D|1W|E|1X|F|G]]|9|@]|A|$]]|$1|11|3|-4|5|6|7|1Y|8|@]|9|@]|A|$]]]|12|$13|$5|14|15|16|A|$17|18|19|-4]]|1A|$5|14|15|16|A|$17|1B|19|-4]]]]

Sadly P4V's argument replacement is broken. You can use TortoiseMerge for diffing, but not merging.

To set up TortoiseMerge for diffing, use the argument string <code>%1 %2</code>

<img src="https://i.stack.imgur.com/cvO0T.png" alt="enter image description here">

The correct arguments for merging would be

<pre><code>/base:%b /theirs:%1 /mine:%2 /merged:%r
</code></pre>

However it gives this error

<img src="https://i.stack.imgur.com/ibMOx.png" alt="enter image description here">

Presumably what's happening is that P4V fails to replace the '%b' in <code>/base:%b</code> with the appropriate file path.

blocks|key|3905846|text|您可以通过创建bat文件来做到这一点。在bat文件中，可以使用正确的参数调用合并程序。这是我的bat文件的内容：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3905847|TortoiseMerge.exe+/base:%251+/theirs:%252+/mine:%253+/merged:%254|code-block|syntax|javascript|3905848|p4+%25b+%251+%252+%25r中的设置：|offset|length|style|CODE|3905849|📷|atomic|3905850|​|3905851|如你所见，我称我的bat文件为"p4Helper.bat“|3905852|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://developer.qcloudimg.com/http-save/yehe-900000/d49b3508cee35de4652595bd364c8449.jpg|imageAlt^0|0|0|3|B|0|0|1|0|0|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|13|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|14|8|@$I|15|J|16|K|L]]|9|@]|A|$]]|$1|M|3|N|5|O|7|17|8|@]|9|@$I|18|J|19|1|1A]]|A|$]]|$1|P|3|Q|5|6|7|1B|8|@]|9|@]|A|$]]|$1|R|3|S|5|6|7|1C|8|@]|9|@]|A|$]]|$1|T|3|-4|5|6|7|1D|8|@]|9|@]|A|$]]]|U|$V|$5|W|X|Y|A|$Z|10|11|-4]]]]

You can do this by creating a bat file. In the bat file you can call the merge program with the correct arguments. This is the content of my bat file:

<pre><code>TortoiseMerge.exe /base:%1 /theirs:%2 /mine:%3 /merged:%4
</code></pre>

The settings in p4 <code>%b %1 %2 %r</code> :
<img src="https://i.stack.imgur.com/brwxQ.jpg" alt="Settings in P4">

As you can see I called my bat file "p4Helper.bat"

blocks|key|3905868|text|存在一个现有的增强请求，因为如果%25b、%251、%252和%25r不是单独的参数，则P4V不会替换这些值。例如，P4V不能替代：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3905869|+/base:%25b+/theirs:%251+/mine:%252+/merged:%25r|code-block|syntax|javascript|3905870|这是TortoiseMerge所需要的。|3905871|但是，一位用户报告说，由于路径名中的空格，一旦他在路径名周围添加引号，该命令就可以工作。例如：|3905872|启动/WAIT+"C:/Program+/Beyversal3/BComp.exe“%251+%252+%253+/mergeoutput=%254|3905873|因此，作为解决办法，您可以在调用TortoiseMerge的脚本中增加%25b+%251+%252+%25r参数。在TortoiseMerge的例子中，你会有这样一条线：|3905874|+c:"\the_path_to_TortoiseMerge"+/base:%251+/theirs:%252+/mine:%253+/merged:%254|3905875|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|V|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|W|8|@]|9|@]|A|$]]|$1|M|3|N|5|6|7|X|8|@]|9|@]|A|$]]|$1|O|3|P|5|D|7|Y|8|@]|9|@]|A|$E|F]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

There is an existing enhancement request because P4V does not substitute values for %b, %1, %2, and %r if these arguments are not by themselves. For example, P4V does not substitute:

<pre><code> /base:%b /theirs:%1 /mine:%2 /merged:%r
</code></pre>

which are needed by TortoiseMerge.

However, one user reported that the command worked once he added the quotes around the pathname due to the spaces in it. For example:

start /WAIT "C:/Program Files/Beyond Compare 3/BComp.exe" %1 %2 %3 /mergeoutput=%4

Thus as a workaround, you can augment the %b %1 %2 %r arguments in a script that calls TortoiseMerge. In TortoiseMerge's case, you would have a line like this:

<pre><code> c:"\the_path_to_TortoiseMerge" /base:%1 /theirs:%2 /mine:%3 /merged:%4
</code></pre>

How can I configure Perforce to use the tool TortoiseMerge for diff and merging?

<hr>

I tried arguments

<pre><code>/base:%1 /mine:%2
</code></pre>

<img src="https://i.stack.imgur.com/8k7R7.png" alt="enter image description here">

following <a href="http://tortoisesvn.net/docs/release/TortoiseMerge_en/tme-automation.html" rel="nofollow noreferrer">http://tortoisesvn.net/docs/release/TortoiseMerge_en/tme-automation.html</a> and <a href="http://www.perforce.com/perforce/doc.current/manuals/p4v/Configuring_display_preferences.html#Diff" rel="nofollow noreferrer">http://www.perforce.com/perforce/doc.current/manuals/p4v/Configuring_display_preferences.html#Diff</a> . The Perforce docs say 

<blockquote>
 Specify arguments for third-party diff applications in the Arguments field:
 Enter %1 for the name of the first file and %2 for the name of the second file. P4V replaces these placeholders with the actual filenames when calling the diff application.
</blockquote>

Yet when I try it, TortoiseMerge errors "Can't open file %1" suggesting P4V didn't replace the arguments and left <code>%1</code> as is

<img src="https://i.stack.imgur.com/6MeN5.png" alt="enter image description here">

How to use TortoiseMerge from Perforce P4V?

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

教程

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云智能顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

聚焦“写作效率、视觉美观与运行性能”三方面进行全面升级，为您提供更高效、稳定的创作环境

社区富文本&Markdown编辑器全新改版上线，欢迎大家体验!

诚挚邀请您参与本次调研，分享您的真实使用感受与建议。您的反馈至关重要，感谢您的支持与参与！

社区新版编辑器体验调研

如何配置Perforce以使用工具TortoiseMerge进行区分和合并？我试着争论/base:%1 /mine:%2​​跟踪和。最好的医生说在参数字段中为第三方diff应用程序指定参数:为第一个文件的名称输入%1，为第二个文件的名称输入%2。在调用diff应用程序时，P4V用实际的文件名替换这些占位符。然而，当我尝...

问如何使用Perforce P4V中的P4V？
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何使用Perforce P4V中的P4V？EN