Merging question

I have a question along the lines of this thread: "Merging moved files" (http://svn.haxx.se/users/archive-2004-05/0451.shtml)

I am currently trying to do something similar: a major reorganization of our directory structure (5 years of no planning and neglect made it a mess!). The problem is that some changes are still being done on the main line of development (trunk). I am trying to do the reorg in a branch, then rewrite all of our build scripts (and etc), then merge the changes back into the trunk.

Has merging improved in the last year?

An issue raised in the above thread was that the merge used the pre-branching version of the file, instead of the evolved trunk version. Was this a real problem or just a perceived problem? What if another developer renames/moves a file in one of the directories that I move?

We are just now starting to use Subversion -- finally convinced my boss -- but this is a major issue for us.

Thank you in advance for any assistance,
Michael
Received on Fri Nov 18 01:06:05 2005