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

On Fri, 18 Jun 2004, Jeff Squyres wrote:

>> [snipped]
>> 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).

We have replicated this problem; here's what happened (these commands are
all run from the top-level directory of a
svn+ssh://machine/repoistory_name/trunk checkout):

------
shell$ svn up
A test/class/ompi_rb_tree.c
U test/class/Makefile.am
   U test/class
U src/event/Makefile.am
[...snipped more normal update stuff, nothing from src/mca yet....]
U src/request/request.c
U src/request/request.h
U src/mca/ptl/elan/configure.params
U src/mca/ptl/elan/src/ptl_elan_init.c
U src/mca/ptl/elan/src/ptl_elan_frag.h
U src/mca/ptl/elan/src/ptl_elan_priv.h
U src/mca/ptl/elan/src/ptl_elan.h
U src/mca/ptl/elan/src/ptl_elan_module.c
U src/mca/ptl/elan/src/Makefile.am
U src/mca/ptl/elan/Makefile.am
U src/mca/ptl/elan/configure.stub
svn: Won't delete locally modified directory 'src/mca'
svn: Left locally modified or unversioned files
shell$ svn cleanup
shell$ svn up
svn: Won't delete locally modified directory 'src/mca'
svn: Left locally modified or unversioned files
shell$ svn log -v -rHEAD
------------------------------------------------------------------------
r1443 | jsquyres | 2004-06-23 07:39:26 -0600 (Wed, 23 Jun 2004) | 3 lines
Changed paths:
     M /trunk/src/mca/base/mca_base_module_find.c
     M /trunk/src/mca/base/mca_base_modules_open.c

Fix some more minor memory problems; convert some of the DSO loading
code to use OBJ_* things instead of manual malloc/free.

------------------------------------------------------------------------
shell$
-----

The "svn log" shows that my developer is trying to get a change that I
committed this morning -- I did not change the properties on src/mca,
delete it, branch/copy it, etc. It's just two files within a
subdirectory of src/mca (specifically, src/mca/base).

Are we doing something wrong?

We have found that repeatedly running "svn cleanup; svn up" will clear
the problem -- but sometimes it has to be run tens of times. So we
have a script:

-----
#!/bin/csh

set done=0
while ($done == 0)
         echo running cleanup/up
         svn cleanup
         svn up
         if ($status == 0) then
                 echo "svn up was happy -- whoo hoo!"
                 set done=1
         endif
end
-----

Clearly, this is sub-optimal, but it's better than removing your entire WC
when you have lots of changes that you don't want to ditch. ;-) Indeed,
you can't necessarily get a coherent "svn diff" and patch that onto a new
WC because you may potentially have an inconsistent checkout at this
point.

Any suggestions would be greatly appreciated.

Many 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