lets i have the project with vcs root set to <clientpath>/product1/main;
i've created the branch with branch 'product1_br1' with the following specification :
//depot/product1/main/... //depot/product1/br1/...
if i now make some changes in branch, i can normally integrate them to my project, using IntegrateProject dialog (select branch, check the 'reverse' checkbox). According to p4.output log, the following command is used in this case:
integrate -b product1_br1 -r <clientpath>/product1/main/...
However, if i want to integrate some changes made in main view into my branch, i.e. use Integrate Project/Directory feature with 'reverse' unchecked, or using 'integrate changelist' option, i get no results:
the only result is error message like
Error:<clientpath>/product1/main/... - no target file(s) in both client and branch view.
according to log, the performed command is like following one:
integrate -b product1_br1 <clientpath>/product1/main/... [@changelist,@changelist]
this one doesn't work for me from command line also; however, the following ones work perfectly:
integrate -b product1_br1 -s <clientpath>/product1/main/...
integrate -b product1_br1 // cannot be used generally since it processes all folders
If you want to integrate changes from opened branch view into main (so that you would check “reverse” check box), you would see such command in p4.output:
integrate -b product1_br1 -r <clientpath>/product1/br1/...
And it would fail with similar error:
Error:<clientpath>/product1/br1/... - no target file(s) in branch view.
The reason of such behavior is that p4 integrate syntax implies that 2nd argument in expression like this is target files, while IDEA provided source files.
So there are 2 possible solutions for such cases: