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).

I think you're right. We should have a concept of 'tree conflicts':
not the content itself mismatches, but the expected and actual trees
and tree operations.

This is issue 2282
(http://subversion.tigris.org/issues/show_bug.cgi?id=2282) which has a
number of dependent issues describing where our current conflict
handling breaks down.

Could you create an issue for this and make it dependent on 2282?

Thanks in advance!

bye,

Erik.

---------------------------------------------------------------------
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:49:35 2007