在 Perforce 集成期间忽略源文件的正确方法 [英] Proper way to ignore source files during Perforce integration

问题描述

在我的主要分支中有一个包含 10 个文件的更改列表，我正试图将这些文件集成到开发分支中.更改列表中的所有未完成文件都应该被忽略，而不是分支到目标中.

In my primary branch there is a change list with 10 files that I'm trying to integrate into a development branch. All of the outstanding files in the change list should be ignored, and not branched into the target.

进行集成的步骤是什么，以便 Perforce 不会在目标分支中创建文件，并忽略所有未来集成的更改列表文件?

What are the steps to do the integration so that Perforce does not create the files in the target branch, and ignores the change list files for all future integrations?

我最初是用-Dt做了一个集成，然后在目标分支中还原了我不想创建的10个文件.此后，Perforce 继续尝试将这些文件重新集成到目标.

I originally did an integration with -Dt, and then reverted the 10 files I did not want to be created in the target branch. After this, Perforce continues to try and re-integrate these files to the target.

也许这是问题的一部分或无关紧要，但源文件不是文本编辑，而是对文件类型字段的更新

Maybe this is part of the issue or irrelevant, but the source files are not textual edits, but updates to the filetype fields

推荐答案

集成文件，然后在解决时执行accept yours".这告诉服务器您要明确忽略来自另一个分支的更改，并且服务器随后不会在未来的集成中包含该更改.

Integrate the file, then do 'accept yours' when you are resolving. That tells the server that you want to explicitly ignore the change from the other branch, and the server won't subsequently include that change in future integrations.

这篇关于在 Perforce 集成期间忽略源文件的正确方法的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！