无法使用集成在 P4 中创建新分支 [英] Unable to create new branch in P4 using integrate

问题描述

我在 P4 有一个分店

I've a branch in P4 at

//depot/MyDemoInfo/trunk/Server/My_Service 

&在 My_Service 下，我的整个源代码都存在.

& under My_Service, my entire source code is present.

现在，当我尝试从上述主干分支创建新分支时，出现错误:

Now, When I'm trying to create a new branch from the above trunk branch, it is giving me error:

我正在尝试创建一个新的发布分支，如下所示:

I'm trying to create a new release branch as shown below:

//depot/MyDemoInfo/1.0/Server/My_Service 

因此，我在将其添加到我的客户端规范中后发出了以下命令:

So, I issued below command after adding it in my client specs:

p4 integrate //depot/MyDemoInfo/trunk/Server/My_Service/... //depot/MyDemoInfo/1.0/Server/My_Service/...

它给出了以下错误:

//depot/MyDemoInfo/1.0/Server/My_Service//abc.txt - can't integrate from //depot/MyDemoInfo/trunk/Server/My_Service/abc.txt#1 (moved from //depot/MyDemoInfo/trunk/Server/My_Service/abc.txt; provide a branch view that maps this file, or use -Di to disregard move/deletes)

对于我的主干分支中的所有文件，它给出了与上述相同的错误.有人可以帮助我这里发生了什么问题吗?

For all files in my trunk branch, it is giving same above error. Can some one help me what is wrong going on here??

谢谢！

推荐答案

在运行 p4 集成 时，集成的目标应该映射到您的 perforce 客户端工作区这就是这个错误所表明的:

When running a p4 integrate, the destination for the integration should be mapped in your perforce client workspace which is what this error indicates:

提供映射此文件的分支视图，或使用 -Di 忽略移动/删除

使用 p4 client 或 p4v，将以下 perforce depot //depot/MyDemoInfo/1.0/Server/My_Service 映射到您的客户端工作区到你机器上的某个目录说:/myp4workspace/MyDemoInfo/1.0/Server/My_Service

Using p4 client or p4v, map the following perforce depot //depot/MyDemoInfo/1.0/Server/My_Service into your client workspace to some directory on your machine say: /myp4workspace/MyDemoInfo/1.0/Server/My_Service

然后这样做:

cd /myp4workspace/MyDemoInfo/1.0/Server/My_Service
p4 integrate //depot/MyDemoInfo/trunk/Server/My_Service/... ...

# This is optional, but a regular workflow to make sure you resolve all the conflicts
# Display any conflicts (there shouldn't be any since this is the first time you're integrating into this location)
p4 resolve -n ... 

# If there are any, use p4 resolve -as ... , p4 resolve -am ... , and then p4 resolve ...

# Submit your changes after verifying it is correct
p4 submit ...

您可能还需要处理的另一件事是，使用 -t -d 选项运行 p4 integration 以便它保留文件类型，并带来在任何已删除的文件更改中(尽管在您的情况下可能并不真正需要这两个选项，但指定它们没有错).

And one more thing you might want to take care of is, run p4 integrate with the -t -d option so that it preserves file-types, and brings in any deleted file changes (although these 2 options might not be really required in your case but nothing wrong in specifying them).

您还可以在进行任何集成之前运行 p4 where 以确认您位于正确的 perforce depot 位置.

Also you can run p4 where to confirm that you're in the right perforce depot location before doing any integrations.

这篇关于无法使用集成在 P4 中创建新分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！