Consider the following situation:
- Development is mainly done in trunk.
- Branches are used when fixing complex bugs or developing new (unstable at first) features.
Normally these branches are then merged into trunk once development is done. - 1 branch is used as current release branch (say currently "R-1.0").
- Tags are used for the release (would be "R-1.0.0").
Now a complex bug which is in trunk as well as in the current release 1.0.0 must be fixed:
- A branch "BG-1" from trunk will be created.
- The bug will be fixed in this branch.
At the same time development will continue in the trunk.
How do you proceed to reintegrate the branch into trunk and "R-1.0" now?
- Merge trunk into "BG1", then reintegrate "BG1" into trunk and then into "R-1.0".
=>This cannot be the solution as this way "R-1.0" would receive all the stuff that was developed in the trunk since release 1.0 which is not the goal. - Try to reintegrate "BG1" into trunk and then into "R-1.0" without merging the trunk.
=>This also cannot work as other changes which weren't part of release 1.0 are already part of the "BG1" branch.
Is there any solution to this problem?
The only solution I see would be to start "BG1" from "R-1.0" rather than trunk in the first place. If so, does this mean that for each bug fix branch the developer has to find the oldest supported release which contains the bug and branch from this release branch?
Update:
The practice of doing all development in and from trunk originated from this answer by "Jim T" which is a concept I really like.
