Question

I'm trying to merge a branch into a sparse checkout (all the files I touched in the branch are included in the checkout) and I'm getting the following error:

Cannot reintegrate into a working copy not entirely at infinite depth

Does this mean what I think it means? That you have to have a fully recursive checkout in order to merge into?

Was it helpful?

Solution

Just an update for anybody that stumbles across this (like I did)...

SVN 1.7 now supports this functionality. I haven't tried to reintegrate yet but merging a range of revisions seems to work well.

TortoiseSVN 1.7 also has some nice features for working with sparse checkouts.

OTHER TIPS

Merging into a full checkout worked, this is anecdotal evidence that you cannot merge into a sparse checkout.

Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top