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

Re: new dir in 2 working copies at the same time

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-09-12 06:52:15 CEST

solo turn <soloturn99@yahoo.com> writes:
> p1: svn add d
> p2: svn add d
> p1: svn ci -m ""
> p2:
> $ svn up
> svn: Obstructed update
> svn: failed to add directory 'd': object of the same name already
> exists
> $ svn revert d
> Reverted d
> $ svn up
> svn: Obstructed update
> svn: failed to add directory 'd': object of the same name already
> exists
>
> would the best solution be that a standard merge occurs, even if the
> status is "A - added"?

What happens if the 'svn revert' above is changed to 'svn rm'?

(Or are they supposed to have the same effect for an added object? I
seem to remember some issue about this...).

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 12 07:14:29 2002

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