Re: "svn: Won't delete locally modified directory ..."

On Fri, 18 Jun 2004, Ben Collins-Sussman wrote:

>> Note that the directory "mca" has *NOT* been deleted (nor should it be --
>> no one did "svn rm mca; svn ci mca").
>
> That's not the only way 'mca' can be deleted. Remember that renames are
> just copies + deletes. Why don't you run 'svn log -v -rHEAD
> reposrootURL', and see exactly what changes are attempting to be merged.
> The server really is trying to delete the 'mca' directory.

The next time this happens, I will run "svn log ..." and send this
additional information.

FWIW, the "mca" directory (from the example in my prior mail) was not
deleted or renamed (it's a pretty high-level directory in our source
tree).

>> But in addition to complaining about
>> it, it totally stops the "svn update" process. Hence, you have to run
>> "svn up" multiple times
>
> This behavior has been fixed in svn 1.1 (the latest /trunk code). If
> the update process tries to delete a file or directory which contains
> local modifications, it no longer stops dead in its tracks. Instead, it
> just 'unversions' the locally modified object and keeps going. After
> the update completes, 'svn status' shows unversioned objects.

Excellent; that will be great.

Thanks!

-- 
{+} Jeff Squyres
{+} jsquyres@lam-mpi.org
{+} http://www.lam-mpi.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org