[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn merge on branches containing moved files/directories

From: Greg Thomas <thomasgd_at_omc.bt.co.uk>
Date: 2005-03-16 14:51:02 CET

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.

However, if the developer moved A->A1 and copied A1->A2 and A2->A3,
then removed the extra stuff, there's at least the possibility that a
merge could resolve this.

Greg

-- 
This post represents the views of the author and does
not necessarily accurately represent the views of BT.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 16 14:54:27 2005

This is an archived mail posted to the Subversion Users mailing list.