Re: [p4] Missed Integration

Posted on behalf of forum user 'DClyde'.

Posted Image

Top row here is a feature branch that was long ago made off our 1.0 branch. 1.0
was then used to make 1.1, 1.1 to make 1.2, etc
At some point one of those branches were used to make two future branches. That
is the 2 bottom ones in the picture. I will call those "future 1" and
"future 2"
That same branch was then continued down the line until we reached 1.15 (second
row), 1.16, 1.17, 1.8 all seen here. 

With exception of the feature branch they all feed downstream. Every commit is
auto integrated unless a conflict occurs in which case a user resolves it.
The "Feature Branch" has been a long project so as we retire branches
we move its source to the next downstream branch. At one point its source was
1.15 (second row)

During 1.15 a whitespace change was made on our entire codebase. Said change was
integrated to our feature branch, but at some point the merge got messy and the
files were re-opened for edit and we just re-ran the whitespace conversion tool.
A mistake, but that is what happened.

We then made 1.16, 1.17, 1.18 and in all branches this file was never changed.

I recently integrated the "Feature Branch" here into our primary
branch 1.18 (line from top row@6 to 1.18@2) I did this by integrating the whole
branch.
This created a changelist "update mainline"

Auto integrator integrated "1.18 - update mainline" from 1.18 to
"future 1" and AITool.cpp came along for the ride.
Auto integrator integrated "future 1 - update mainline" to
"future 2" and AITool.cpp did NOT come along for the ride.

That line from "Future 1"@9-> "Future 2"@10 in the corner
there was from manually integrating the file ourselves.

Before the manual integration this is what we saw:

p4 integ -b Future1_To_Future2 -s //... 
-AITool.cpp needs integration

p4 integ -b Source_To_Downstream -s //...@"future 1 - update
mainline","future 1 - update mainline"
No files needing integration

p4 interchanges -b Future1_To_Future2
CL: "future 1 - update mainline"

If this is not a bug I would definitely like to hear how it is not a bug. IMO p4
interchanges should never tell me a cl needs integration but p4 integ when
filtered to that changelist tells me there is nothing to integrate



--
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