Re: svn merge on branches containing moved files/directories

Greg Thomas <thomasgd@omc.bt.co.uk> wrote:

> On Wed, 16 Mar 2005 14:33:35 +0100, haller@ableton.com (Stefan Haller)
> wrote:
>
> >Now consider the case where a developer works on file A in his branch;
> >he decides that A has become too large, so he splits it in three new
> >files A1, A2, and A3, then he deletes A. (No move involved.)
>
> The developer has deliberately created new files with no history and
> no link to the original - there is no way any system could resolve
> this.

Of course, I don't expect the system to resolve this for me; I just
expect it to tell me about it (loudly) so that I get a chance to resolve
it manually.

My problem is that the "true moves" feature that Ben was talking about
is still no complete solution to the problem, and it is probably not
going to be implemented any time soon. I need a solution now; we are
afraid of losing data.

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