Geek Answers Handbook

Does SVN support merging with sparse cash registers?

I try to merge the branch into a sparse checkout (all the files that I touched in the branch are included in the checkout) and I get the following error:

It is not possible to reintegrate into a working copy incompletely at infinite depth

Does this mean that I think it means? What do you need to have a fully recursive check in order to merge?

+6
merge svn sparse-checkout
source share
2 answers

Just an update for anyone who stumbles upon this (like me) ...

SVN 1.7 now supports this functionality. I have not tried to reintegrate yet, but merging a number of changes seems to work well.

TortoiseSVN 1.7 also has some useful features for working with sparse cash registers.

+6
source share

Merging with a full check worked, this is incontrovertible evidence that you cannot merge into a rare check.

+1
source share

More articles:


All Articles