Geek Answers Handbook

Can I continually merge from branch to trunk with Subversion merge tracking?

We have released version 1.0 and will continue to develop 2.0 in the trunk. We created /1.0 branches for fixing bugs related to the released version.

Plan:

  • 2.0 development continues in trunk /
  • trunk / contains new features that should not be merged into /1.0 branches, so the trunk is not merged into /1.0 branches
  • When errors are detected in the released application, corrections are embedded in the /1.0 branches. When the fix pack is put into production, the /1.0 branches are copied to the /1.0.x tags, and the /1.0 branches are merged into trunk /
  • The idea is that tracking the merge of the subexpressions should keep track of the changes, so that when we merge the 1.0.4 fixes to the backbone, the 1.0.3 fixes are automatically skipped.

Are there any problems with this approach? Will subversion merge tracking track changes OK? I have not tried this in practice yet, and most examples do it differently (merging from a trunk to a branch, which I don’t want, since most versions 2.0 are not required in 1.0 fixes). Does merger-reintegration affect one way or another?

+5
source share
1 answer

Yes, that’s exactly what it is for. Because the property svn:mergeinfoon the outside line keeps track of which corrections from 1.0 were merged back, re-executing the merge will not cause it to capture those revisions again.

-, , , , . .

+6

More articles:


All Articles