[p4] Missed Integration

Posted on behalf of forum user 'DClyde'.

For reference we are currently using "P4D/LINUX26X86_64/2016.2/1468155
(2016/11/28)"
I am using a 17.1 P4V client

Problem:

We occasionally have changelists that when integrated from one branch to another
branch do not integrate all of the files. The files in question tend to be
no-ops either the file had already been altered identically in the downstream
branch or wasn't reverted on commit I am uncertain. This doesn't appear
to be a "revert unchanged on commit" issue as the file never even
tries to be integrated.

We have witnessed this with the following behaviors.

Commit only unresolved changelist 123 from branch 1 to branch 2 as changelist
456.
Attempt to do head integration of entire branch 1 to branch 2, notice it wants
to integrate file A. 
Looking at File A it was committed in changelist 123 to branch 1. Look at 456
and notice it was not committed.

With the last change to File A being the "change" in CL 123:
If we try and integrated changelist 123 it tells us there is nothing to
integrate.
If we integrate head revision of the entire branch 1 to 2 it tells us this file
needs to be integrated.
If we try to integrate just that file it tells us it needs to be integrated.

I _believe_ but have not verified with a test case that
If we then change File A in branch 2, and we try to re-integrate the changelist
123 from 1 to 2 we get an integration with a conflict.

Although I have had test cases with files/changelists in these states I do not
have a reproduction for this. It happens rarely but it does happen and larger
changelists seem to have a higher chance of it happening. We recently changed
our whitespace coding convention rules and when we did as such caused some
issues merge wise for us in multiple branches due to our own errors reproducing
the conversion in each branch. As various feature branches merged back into
mainline they occasionally triggered the same error with changelists around the
10k-14k file mark.

I currently have somewhere about 23 files in this state. Let me know what
information I can provide, we would like to prevent this from happening in the
future. I have reviewed the release notes between 16.2 and 17.2 and do not
believe I saw a fix for this issue, but could have missed it or not understood a
release note.

Thank you,
David



--
Please click here to see the post in its original format:
  http://forums.perforce.com/index.php?/topic/5528-missed-integration
_______________________________________________
perforce-user mailing list  -  [email protected]
http://maillist.perforce.com/mailman/listinfo/perforce-user