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

Re: two people add the same thing

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-11-11 14:12:25 CET

On Tue, 2003-11-11 at 04:40, solo turn wrote:
> if two people want to add the same directory, it does not work automatically (0.32.1, linux):
> svn: Obstructed update
> svn: failed to add directory 'trunk/mydir': object of the same name already exists
> would an automatic "merge" with the existing thing in the working copy be possible?

Someday, perhaps we'll have sophisticated tree-merging tools that work
with the 'svn merge' and 'svn update' commands. For now, we only have
the ability to merge file contents. Resolving tree conflicts is a much
trickier problem. What you see above is only one of many different
kinds of tree conflict.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 11 14:13:16 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.