在perforce中重新应用变更列表 [英] Reapplying changelist in perforce

问题描述

我对perforce还是比较陌生，但是有很多其他VCS经验...

I'm rather new to perforce, but have quite a bit of other VCS experience...

想象一下:

• 您提交更改(更改列表1)
• 某位同事在同一分支上提交更改，从而意外覆盖了您的更改. (更改列表2)

我尝试了集成(由于P4V已经集成，所以拒绝这样做)，并寻找一种方法来生成可以应用但无法找到任何补丁的补丁.
现在，我将检查有问题的版本并使用外部合并工具，但是很高兴知道perforce是否以某种方式支持此功能.

I tried integrating (which P4V refuses to do since it's already integrated) and looked around for a way to just generate a patch that I could apply, but couldn't find anything.
For now, I will check out the versions in question and use an external merge tool, but it would be great to know if perforce supports this somehow.

是否有一种使用perforce工具(最好是在P4V中)重新应用变更列表1的方法?

Is there a way using the perforce tools (preferably in P4V) to reapply changelist 1?

推荐答案

您不能重新应用变更列表1，但是可以重新应用变更列表2.

You can't reapply changelist 1, but you can reapply changelist 2.

• 同步到变更列表1.
• 检出文件. P4V会警告您您没有该文件的最新版本."，并询问您是否要获取最新版本.单击不获取最新"按钮，忽略警告.
• 现在同步到主要修订版(我假设变更列表2对应于主要修订版).现在需要解析文件，您(或您的同事)可以这次正确地这样做，而不会破坏您在变更列表1中所做的更改.

• Sync to changelist 1.
• Check out the file(s). P4V will warn you that, "You do not have the latest revision of the file.", and ask you if you want to get the latest. Ignore the warning by clicking the "Don't Get Latest" button.
• Now sync to the head revision (I'm assuming changelist 2 corresponds to the head revision). The file(s) will now need to be resolved, which you (or your colleague) can do, properly this time, without clobbering the changes you made in changelist 1.

这篇关于在perforce中重新应用变更列表的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！