> The situation is probably best explained by examples. In the
> beginning
> there was one development branch (the trunk), from which other
> client-specific branches were created (copied). Over time,
> development
> continued in both the trunk and the branches. Specifically, some
> directories and files in the trunk were reorganized, moved by svn
> copy+delete, while this wasn't necessary on the client branches.
> Now,
> I'm wandering if there is a way to merge changes from one client
> branch which got a lot of development back to the trunk, but to
> take
> into account the moved files.
>
> For example, trunk has:
>
> trunk/file1
> trunk/dir1
> trunk/dir1/file2
> trunk/dir1/file3
>
> The branch has:
>
> branch/file1
> branch/file2
> branch/dir1
> branch/dir1/file3
>
> In other words, file2 was moved (copy+delete in svn so there is a
> metadata record) to dir1 in the trunk but still exists in the base
> directory in the branch, and I'm trying to merge branch/file2 to
> trunk/dir1/file2. There are a lot of such cases.
>
> The repository was always from svn 1.5 so metadata is recorded for
> merges and copies, I'm currently using a 1.6 svn client.
>
> Apparently, the merge operation doesn't read the metadata recorded
> on
> copy operations and tries to merge the source to the now non-
> existant
> (moved) file (i.e. tries to merge branch/file2 to trunk/file2
> instead
> of trunk/dir1/file2).
>
> Is it possible to do this bulk merge from the client branch to the
> main one, or I'm expecting too much, especially with the parts of
> the
> tree that were moved?
No, you will most likely get "Tree Conflicts" when you attempt to do the merge back into trunk. You can either make the same moves to the branch and then do the merge. Or deal with the tree conflicts as you do the merge. Here is a link to the svn book about it:
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.tour.treeconflicts
BOb
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2424305
Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-11-25 16:59:51 CET