Tree conflicts - accidentally losing changes when merging

Ben wrote on users@:

> The simple fact is: "tree conflicts" still happen. One one branch, a
> file may be deleted, and on another branch the file might be changed.
> When merging the latter branch to the former branch, we get a 'skipped'
> message: the merge command is unable to apply a change to a file
> that's just not there. When merging in the other direction, the merge
> command silently deletes the newer version of the file.

This is a general problem, but it is especially problematic as long as
we don't have true moves: when renaming a file or directory on one
branch, it can easily wipe out changes that are done to the file under
the old name in another branch. Completely without notice.

This is a huge problem for us (and, in my opinion, for everyone who
works with branches).

Has anybody already thought about the issue, any ideas how a directory
could be marked as conflicting in such a case?

-- 
Stefan Haller
Ableton
http://www.ableton.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org