[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merges into sparse working copies and tree conflicts

From: Bob Archer <bob.archer_at_amsi.com>
Date: Thu, 23 Apr 2009 17:31:18 -0400

> Now, after some time, I want to merge from trunk, so I:
> svn merge --depth=infinity ^/trunk

If you only want to merge to the depth in your WC... why are you
specifying infinity? It seems to be that if there are changes in folders
you don't have checked out then yes you will have tree conflicts because
those folders and files aren't on your WC. The merge is applied at the
client level not on the server.

As for why it takes so long... well... I can't answer that. The svn
dev's say wait for ver 1.7 for the resolution to that issue.

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1882358

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-23 23:32:09 CEST

This is an archived mail posted to the Subversion Users mailing list.