[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: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2006-02-10 18:50:37 CET

Quoting Matt England <mengland@mengland.net>:
>
> 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?

No they will not, in fact, you have a 'bigger' problem:
Since you create a new folder 'newfolder' both in trunk and in branch, for
subversion these are different folders. Although they have the same name, there
identity is different ( and rightly so ).

So in your example, if you do that merge, the result will be that changes in the
branch/newfolder will be skipped or will result in conflicts. You'll see the
message: 'Skipped missing target newfolder' in the merge output.

>
> -Matt

Lieven.

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

---------------------------------------------------------------------
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:02:10 2006

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