Merge tracking question

I have read several times the svn and tortoise dock on merging and merge
tracking and I am not very clear on something.

The common theme of merge tracking in the doc seems to be that I have a
trunk and a feature branch. I periodically merge to the feature branch
from trunk to get any changes in trunk since the branch was made. These
merges are tracked so I just need to do a merge and it will get the next
revisions since the last merge. Then, using reintegrate merge to move
the feature branch stuff into trunk. Fine.

What about the situation where I have a release branch and I want to
merge in any changes made to that back into trunk... but I don't want to
merger stuf from trunk into the feature branch. Here's my example...

/trunk <- this contains our next release development

/trunk/tag/v6.0 <- a tag of trunk when 6.0 when gold

/branches/v6.0 <- this was branched from 6.0 point in trunk

The 6.0 branch is used to create a hot fix to 6.0... say 6.0.0.1.

Now, I want to merge changes from the v6.0 branch into trunk. Is this as
simple as doing an svn merge /branches/v6.0 in the /trunk working dir?

Then, we continue and do hot fix 2 in the branch. I want to now merge
that into trunk. Can I do an svn merge /branches/v6.0 in the /trunk
working dir? It will know about the previous merge from that branch and
only merge in the changes in the new range of revisions?

Or for this scenario do I still need to do something like svn merge
/branches/v6.0_at_100 /branches/v6.0_at_120 and then remember on the next
merge to start at 121? Basically the same thing I had to do in svn 1.4?

Thanks in advance for any clarification of this. The doc doesn't seem
really clear on this.

BOb

 
Received on 2008-11-07 20:17:34 CET