CODEWITHSUNDEEP
perforceperforce-integrate
Kalicz
Kalicz

Reputation: 346

P4 integrate of files that were moved and deleted

I'm trying to integrated about 30 changelists from my branch to parent branch and I need to cherry-pick only related CLs.

There is a file File1 that was Updated, Renamed+Moved and Deleted. There are also files File2 - File10 that were added and immediately deleted.

P4 visual client ends with an error that File1 can't be integrated because is already opened on this client.

I tried to manually integrate cherry-picked CLs in bash:

cat changelists | while read CL; do 
  echo "Integrating $CL: "
  p4 integrate -c 123456 //depot/MyBranch/...@="${CL}" //depot/ParentBranch/...
done

This does not complain about existing files, but it does not remove files, that were added and than deleted. Resolving does not offer to remove them. They are just marked for branching.

I tried -Di, -Ds, -f, -3 options, but this was not helpful. I'm not able to remove them manually, because it is almost 200 of files and not everything is my code.

Server version: P4D/LINUX26X86_64/2015.1/1227227 (2015/08/27)
Proxy version: P4P/LINUX26X86_64/2013.3/822226 (2014/04/08)

Upvotes: 3

Views: 3295

Answers (1)

Samwise
Samwise

Reputation: 71517

The easiest solution is going to be to submit the first batch of integrates before proceeding. In many cases you can stack up multiple integrates into a single revision, but once the integrate operations require opening the file for different actions (branch vs integrate vs delete vs move etc) you'll get the "already opened for (action)" error and it won't be possible to continue. If you submit the already opened file, a subsequent integrate will be able to create a new revision with the appropriate action.

Upvotes: 2

Related Questions