FW: Updating involving deleted/moved directories

[Jack Ivey <iv...@altair.com>]

Sorry if this is a repeat....


Ben,
You asked for it, I hope this isn't too detailed!  The message I was 
talking about is:

svn: Won't delete locally modified directory 'b'
svn: Left locally modified or unversioned files

Actually the message is a bit misleading, in this case the unversioned
file is b\d\newfile.txt.

The client appears to stop the update when the unversioned file is
encountered and the rest of the tree isn't updated.  If you repeat
the update it completes normally.

This may seem like an obscure issue, but it is hitting us frequently,
we have hundreds of unversioned binaries and works in progress 
in our working areas and every time someone moves a directory it's 
a niusance to get updated.

See detailed recipe below (my comments in <>):

server=0.37 Linux
client=1.0.0 Win32

Thanks,
Jack

<Alice checks out the tree>
C:\temp\stuff>svn co http://pc233/svn/test/deltest1
A  deltest1\a
A  deltest1\a\f1.txt
A  deltest1\b
A  deltest1\b\d
A  deltest1\b\d\f4.txt
A  deltest1\b\f2.txt
A  deltest1\c
A  deltest1\c\f3.txt
Checked out revision 74.

<Bob moves a subdirectory>
C:\temp\stuff>svn mv http://pc233/svn/test/deltest1/b/d
http://pc233/svn/test/deltest1/a -m"move directory in repository"

Committed revision 75.

<Bob modifies and commits the change to a file in dir c>
C:\temp\stuff>svn co http://pc233/svn/test/deltest1/c c
A  c\f3.txt
Checked out revision 75.

C:\temp\stuff>cat >> c\f3.txt
Change by someone else

C:\temp\stuff>cd c

C:\temp\stuff\c>svn commit -m"a change by someone else"
Sending        f3.txt
Transmitting file data .
Committed revision 76.

<Alice adds an unversioned file> 
C:\temp\stuff>cat > deltest1\b\d\newfile.txt
asdf

<Alice updates from the repository>
C:\temp\stuff>cd deltest1

C:\temp\stuff\deltest1>svn up
A  a\d
A  a\d\f4.txt
svn: Won't delete locally modified directory 'b'
svn: Left locally modified or unversioned files
<Actually, the moved directory was b\c>

<Check contents of c\f3.txt>
C:\temp\stuff\deltest1>cat c\f3.txt

<file c\f3.txt wasn't updated to 76>

<Alice runs update again>
C:\temp\stuff\deltest1>svn up
U  c\f3.txt
Updated to revision 76.

<Check contents of c\f3.txt again>
C:\temp\stuff\deltest1>cat c\f3.txt
Change by someone else
<now update is complete>


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