Re: Bug in svn update?

On 10/9/07, Stefan Schulze <algroth@gmx.de> 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? There are conflicting
> changes on the quite every line of the file - deleting the line (in the wc)
> and adding/changing it (from update).

You didn't actually change the content of the file, you just marked it
to be deleted.

Matjaz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 9 13:46:30 2007