Menu
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?
955
In Subversion terminology, the general act of replicating changes from one branch to another is called merging, and it is performed using various invocations of the svn merge subcommand. In the examples that follow, we're assuming that both your Subversion client and server are running Subversion 1.7 (or later).
Examples. Merge a branch back into the trunk (assuming that you have an up-to-date working copy of the trunk): $ svn merge --reintegrate \ http://svn.example.com/repos/calc/branches/my-calc-branch --- Merging differences between repository URLs into '. ': U button.
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.
59
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
