I am trying to find the best way to merge a large directory restructure
between two branches.
My team is actively developing towards a 10.0 release a year away on
trunk. Another team is actively developing a 9.1 release (minor
enhancements and bug fixes to 9.0) on a release line.
We foresee this parallel development happening at least for the next 6
months...
Even though 9.1 is supposed to be a stable release line we decided to
rework the entire directory structure and rename many of the project
files. ( It was worth it )
What I am looking for now is the easiest way to merge those changes into
trunk. If I understand correctly, the svn move operations on the 9.1
branch copied the 9.1 versions of the files then marked the old location
for deletion. A simple merge of the rework results in the trunk now
having the 9.1 version of each of the files in the new location and the
modified version in trunk at the old location is marked for deletion so
no conflicts occur, just a bunch of deletes and adds.
I am thinking I could try a couple of things. If I repeat the svn move
operations on trunk before merging will the svn merge of the 9.1 changes
catch that the files are the same and try to merge them. The file in the
working copy would have a status of added from the svn move operation
and the svn merge would also try to add the file in the same location,
it doesn't sound like it will merge?
Another thought was that a simple merge from 9.1 letting all the changes
from the trunk over the last few weeks since the branch was created
would result in the changes on trunk being lost in the files in the new
locations. BUT, couldn't I then just do another svn merge specifying the
changesets on trunk from the time the branch was created till now and
merge them into the new folder locations?
I know that the situation isn't ideal from an SCM perspective with the
parallel development happening for so long and massive changes happening
in a stable release line, but any help would be appreciated :-)
Thanks,
Steve
Received on Wed Nov 8 18:34:41 2006