Re: [p4] Missed Integration

Posted on behalf of forum user 'DClyde'.

The reason that Feature#6 got merged to 1.18#2 is, at least from a graph
standpoint, there was a change (Feature#5 which was an identical whitespace
change) that _could_ have made Feature#6 different after integration conflict
resolution from 1.15#7 such that it and 1.18#1 were not identical. That said,
diffing the two versions of the file they appear identical even with all
whitespace treated as significant. But I don't pretend to know if the
revision engine behind the scenes cares about actual content or just actions
before the diff for conflict resolution.

Unfortunately the full branch history is very very large. It is just more of the
same where most branch relationships are like 1.16, 1.17, 1.18 with the
occasional rare branch made well ahead of time like Future1 and Future2 and a
FeatureBranch as such. This is actually a very accurate representation of a
subset of our stuff. I originally didn't show the history because I
didn't realize you could trim it down and re-order it as it is just unwieldy
to look at otherwise and honestly if it can be avoided I do not wish to try to
organize that many branches also the names dissapear when zoomed out. These
files didn't give any issues on any integrations or branching setups until
this particular configuration.

And yes, I cannot reproduce it either. I had about 10,000 files with seemingly
identical actions all in this same changelist handling fallout from whitespace
changes and in the end only some of the files had this issue. Certainly
something was different, but looking at the history for specific files I
couldn't tell you what it was it all looks the same to me.



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