Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Does SVN support merging into sparse checkouts?

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?

like image 955
Motti Avatar asked Oct 26 '10 10:10

Motti


People also ask

What is merging in svn?

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).

How do I merge two svn revisions?

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.


1 Answers

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.

like image 59
Andrew Durward Avatar answered Oct 11 '22 15:10

Andrew Durward