I've had a branch open for a couple weeks...
Periodically have done sync merges trunk --> branch using the right-click "merge all"
Yesterday, I did my final sync merge and then tried to merge my branch back to the trunk...
It failed with the following:
Error: Reintegrate can only be used if revisions 36032 through 36478 were previously
Error: reintegrate source, but this is not the case:
Error: DevTrunk/FO4924
Error: Missing ranges:
Error: /DevTrunk/Dev:36056,36072,36075,36079,36089,36115,36125,36144,36169,36182,36198-36199,36216,36218,36221,36230,36233-36234,36243,36252,36299,36326,36341,36358,36373,36392,36396,36398,36410,36431
<lots more snipped>
I thought I'd recalled seeing that the auto-reintegrate now supported sparse checkouts...is this not the case?
Or perhaps the silly way we have the repository structured is the problem...
Thanks!
Charles