Reputation: 9292
Consider the following situation:
Now a complex bug which is in trunk as well as in the current release 1.0.0 must be fixed:
How do you proceed to reintegrate the branch into trunk and "R-1.0" now?
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.
Upvotes: 2
Views: 2999
Reputation: 1022
I would suggest merging the trunk into BG1, then reintegrating BG1 to the trunk. You could then merge a range of revisions to R-1.0. The commit where you reintegrate BG1 to the trunk should only contain the bugfixes, so you could merge that to R-1.0. Or you could merge the specific commits to BG1 that fixed your bug.
Depending on how much the trunk has changed since R-1.0, you may have to hand edit R-1.0 before committing to make the changes apply to the old code. Such is the nature of maintaining old releases.
Upvotes: 6