Reintegrate Partially Reverted Changes in Perforce

Question

I have these branches:

//mainline
//branch1
//branch2

branch1 is a large set of changes to mainline.

branch2 was created from:

1. Integrated from mainline
2. Integrated from branch1 to get the large changes
3. The files were resolved
4. Many files were reverted because I just wanted a subset of the changes from branch1
5. The changes were submitted
6. Eventually branch2 was integrated back into mainline.
7. branch2 was deleted

Now I need to integrate branch1 into mainline. When I do the integrate in p4v, it misses many of the files because it thinks they were already integrated from branch2 (even though I reverted them). If I "force" integration it thinks every single file (of 8000+) has changed.

How do I make perforce integrate all the changes in branch1?

Answer 1

You can choose the range that you want to integrate, in combination with the "force" integration option. You need to expand the "Limit the range of the integration" section in the Integrate dialog.