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: Command: Auto-merge https://dmssjosvn01.dt.inc:8443/svn/DMS/DevTrunk/FO4924 into C:\SVN\DevTrunk\Dev Error: Reintegrate can only be used if revisions 36032 through 36478 were previously Error: merged from https://dmssjosvn01.dt.inc:8443/svn/DMS/DevTrunk/Dev to the 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 -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/b8037f9e-5159-4411-8fbb-002a277812a0%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
