two people add the same thing

[solo turn <so...@yahoo.com>]

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?

__________________________________
Do you Yahoo!?
Protect your identity with Yahoo! Mail AddressGuard
http://antispam.yahoo.com/whatsnewfree

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: two people add the same thing

[Ben Collins-Sussman <su...@collab.net>]

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