Merges into sparse working copies and tree conflicts
From: <webpost_at_tigris.org>
Date: Thu, 23 Apr 2009 14:15:50 -0700 (PDT)
Hello,
Repository looks like this:
Now, let's say I only care about projects 3 and 5. So I:
svn co svn+ssh://server/repo/trunk --depth empty
Now, I want to create a private branch. So I:
Now, after some time, I want to merge from trunk, so I:
However, now I see a bunch of tree conflicts on some of the other projects that were not part of my checkout - and the merge takes _forever_.
Is this normal? I would expect the merge to ignore the folders I have not checked out. And why is this taking so long (taking 100% CPU on the server)? The repository I am using is quite large - but the sections I actually checked out are not.
Note that I actually DO want a sparse checkout of trunk, as I want to be able to create a branch and commit to my projects atomically.
Thanks!
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.