[Laszlo-dev] svn question

[John Sundman]

First, apologies if this has been covered recently.

I got the following SVN update failure, which I don't understand,  
because I thought the SVN update overwrote local copies unless told  
not to.  But maybe I'm still mentally operating in perforce land.

In any event, what's the solution?

Titania:~/src/svn/openlaszlo/legals jrs$ svn up
U    docs/src/build-dbk.xml
U    docs/src/build.xml
D    docs/src/xsl/common-html.xsl.proto
D    docs/src/xsl/fast-dguide.xsl.proto
D    docs/src/xsl/print.xsl.proto
D    docs/src/xsl/dguide-chm.xsl.proto
subversion/libsvn_wc/update_editor.c:1520: (apr_err=155000)
svn: Failed to add file 'docs/src/xsl/common-html.xsl': object of the  
same name already exists


Thanks,

jrs