Matt,
a merge works indeed as a recursive diff with files ánd folders, so if you
delete a folder in a branch and then merge changes on that branch to the trunk,
the folder will be deleted in trunk as well.
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.
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.
Quoting Matt England <mengland@mengland.net>:
> Anybody know the answer to this? My tests suggest that a merge is not this
> smart, but I want to confirm with the community, if possible, that I'm not
> missing something.
>
> -Matt
>
> At 2/9/2006 07:36 PM, Matt England wrote:
> >One of my subversion-based software projects has made a branch. The trunk
> >directory structure was (probably unfortunately) reorganized such that the
> >files in the directories were not changed, but the director structure
> >(names of dirs, moving of dirs, etc) were.
> >
> >I presume this will break the automated merging capability...or will
> >it? I'm presuming that the merge works, fundamentally, as a recursive
> >diff between 2 directories (and the docs appear to back that up).
> >
> >The next question: if we organize the branch to match the trunk's
> >directory structure, will be able to merge again, as we would have
> >originally if neither the branch nor the trunk directory structure had
> >every changed?
> >
> >I plan on testing this behavior in an offline-test repo; I also thought it
> >worth asking about here.
> >
> >Thanks for any help,
> >-Matt
> >
----------------------------------------------------------------
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 18:18:10 2006