p4 在仓库之间集成/合并 [英] p4 integrate/merge between depots

问题描述

我们有一个开发仓库

//dev/main/mytool

//dev/main/mytool

和生产仓库

//prod/9.3.4/app/mytool

//prod/9.3.4/app/mytool

如何将开发中的所有新变更集集成/合并到生产中?

How do I integrate/merge all the new changesets in dev to production ?

我尝试了 以下:

p4 client dev_port
View:
//prod/9.3.4/app/mytool/... //dev_port/...
p4 integrate //dev/main/mytool/... //prod/9.3.4/app/mytool/...

这会创建一个包含大量文件的大型默认"变更集，但没有差异.

This creates a big 'default' changeset with lot of files, but no diff.

推荐答案

p4 integrate //dev/main/mytool/... //prod/9.3.4/app/mytool/...
p4 resolve -as
p4 resolve

p4 集成 打开文件并安排解析(从源到目标的合并或其他更改传播).

p4 integrate opens the files and schedules resolves (merges or other propagation of change from the source to the target).

p4 resolve 执行实际应用更改的工作.您可以在 resolve 时选择是否要进行安全合并"(即基于整个文件差异的合并)、自动合并"(即允许文本行级合并)，或用源自动覆盖目标，或忽略源，或进行手动调整.上面的序列从安全合并"开始，然后以交互模式完成其余的工作.

p4 resolve does the job of actually applying the changes. You can pick when you resolve whether you want to do a "safe merge" (i.e. a merge based on a whole-file diff), an "automatic merge" (i.e. allowing textual line-level merges), or to automatically overwrite the target with the source, or ignore the source, or make manual adjustments. The above sequence starts with a "safe merge" and then does the rest in interactive mode.

这篇关于p4 在仓库之间集成/合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！