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

Re: Can a merge follow changes in paths in trunk/branch?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-10 18:25:34 CET

At 2/10/2006 11:12 AM, Lieven Govaerts wrote:
>However, there is a problem with renaming folders.
>Suppose you modify a file: branch/folder/test.txt and at the same time you
>rename trunk/folder to trunk/newfolder. When you merge the changes on
>branch to
>trunk the changes in the modified file cannot be merged, because Subversion
>thinks 'folder' is missing in trunk.

Ok, good to know.

However, I believe I'm addressing a situation that appears to be different
from the one described above (although I will read more on the bug
reference below to study further):

After a 'svn copy' of a "trunk" to "branch" at rev M:

svn copy trunk/ branch/
branch/folder/test.txt modified
trunk/folder/test.txt modified
branch/folder/test.txt -- moved to --> branch/newfolder/test.txt
branch/newfolder/test.txt modified (in addition to above modification)
trunk/folder/test.txt modified (in addition to above modification)
trunk/folder/test.txt -- moved to --> trunk/newfolder/test.txt
cd trunk/
# both trunk/ and branch/ now have a uniquely-modified newfolder/test.txt
svn merge -r M:N ../branch

Will all the changes made in test.txt in both the trunk and the branch be
merged together properly?

>This is recorded as issue 898 'Implement true renames:
>http://subversion.tigris.org/issues/show_bug.cgi?id=898
>
>Devs are working on this issue, but I don't expect it to be finished in next
>release.
>
>Lieven.

-Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 18:37:20 2006

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