Re: Tree conflict after a simple delete

Stefan Sperling wrote:
> As far as tree conflicts are concerned, Subversion does not know the
> difference between delete and move, yet. Any delete is therefore
> treated as a potiential move, which can lead to false positives.

I don't quite understand this (nor the whole "true rename" saga). In the case
here, a merged delete (log message "uh this file is not used at all")
conflicts with a local edit (log message "this file is super but has a typo
and therefore was inactive"). Are you saying svn would silently overrule the
local edit if it was sure the delete was a genuine delete?

The contrary should be true, in my opinion. Svn should only silently accept
the delete if it is sure the file is copied and report a conflict for each of
the copies, or something.

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398841
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].