Re: Bug in svn update?

On Tue, Oct 09, 2007 at 01:29:40PM +0200, Stefan Schulze wrote:
> > When you do an update, your the changes from the repository
> > get merged with your local changes. Your file now contains
> > changes from repository (content) plus it is marked for
> > deletion. When you commit, the file gets deleted.
>
> Wouldn't be reporting a conflict the right behavior?

Yes it would, but this is currently not implemented as
subversion only knows the concepts of "conflicts" with
respect to text inside files, not in terms of directory
structure conflicts and file additions and deletions.

It could be argued that this is basically a design error.
See
http://svn.collab.net/viewvc/svn/trunk/notes/tree-conflicts.txt?view=markup
for good descriptions of problems this is causing.

A fix is being worked on.

-- 
Stefan Sperling <stsp@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner