[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: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-02-10 19:04:21 CET

On Feb 10, 2006, at 18:25, Matt England wrote:

> 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?

Subversion would attempt to perform every step that was done on the
branch, on the working copy of trunk. In particular, corresponding to
your 4th line of transcript above, it would try to move folder/
test.txt to newfolder/test.txt, which can't work because there is no
longer any folder/test.txt in the trunk.

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

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