Can P4V integrate revisions from deleted files?

Question

I want to merge some specific changes from one part of a Perforce depot to another. The trouble is, the source folder is deleted at HEAD. This means that when I go to add the source folder in the Merge/Integrate dialog, it doesn't show up in the "Browse for Files/Folder" window.

Is it possible to do the merge?

Answer 1

Yes, but just not from the head revision of a deleted file. Since the head revision of a deleted file is, well, deleted, trying to branch it is essentially trying to branch from something that doesn't exist. You get nothing. You have to branch from a revision prior to the deletion. Restrict your integration operation to a revision number, date, changelist, etc. at which your file(s) still existed. This can be done by applying a filter to your integration operation.

Answer 2

If this is for a small number of files, an alternate way to do this is to start from a Revision Graph and identify whichever revision you want to integrate.

Find the file in the depot tree and type Ctrl+Shift+R to bring up the revision graph. Choose the revision with the changes you want to integrate. (tip: Right-click the revision and open it in an editor to verify, or drag one version onto another version of the file to diff them.)

When you've identified the revision you want to integrate, right-click it and choose Merge/Integrate. Then proceed as usual.

If there are multiple files to integrate, as you go, add them to the same changelist as the previous files for easier resolve and submit.