如何将文件恢复为 Perforce 集成中的修订版?
我有两个分支,我们称它们为主线和 dev1。我定期将文件从主线集成到 dev1。我最后一次集成该文件时,它是主线中的修订版 3。上次是修订版 5。
现在由于神秘的原因消失在时间的沙子中,我想在 dev1 中使用主线文件的修订版 4。这可能吗?
我无法将其集成,因为 P4V 抱怨所有修订都已集成。
我尝试过右键单击->在修订版图上获取此修订版,但这仅更新我在主线中拥有的文件版本,而不是在 dev1 中。
I have two branches, let's call them mainline and dev1. I regularly integrate a file from mainline to dev1. The last-but-one time I integrated the file, it was at revision 3 in mainline. The last time, it was at revision 5.
Now for mysterious reasons lost to the sands of time, I want to work in dev1 with revision 4 of the file from mainline. Is that possible?
I can't integrate it across as P4V complains that all revisions have already been integrated.
I've tried right-click->get this revision on the revision graph, but that only updates which version of the file I have in mainline, not in dev1.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
无论集成历史记录如何,您都可以强制集成。在集成选项对话框上有一个标有“高级选项”的按钮。
在“高级选项”对话框中,选中“强制集成所有修订版,忽略集成历史记录 (-f)”选项”。这将允许您将该文件的修订版 4 从主线获取到 dev1。
You can force an integration regardless of the integration history. On the Integrate options dialog there is a button labeled "Advanced Options".
On the Advanced Options dialog, check the option to "Force integration on all revisions, disregarding integration history (-f)". This will allow you to get revision 4 of that file from mainline into dev1.