On 11/01/2010 18:09, Tyler Roscoe wrote:
The usual way to do this is to make the bugfix on trunk and then cherrypick merge the change from trunk up to your branch.
Sure, in the early stages of the release process, but near or past D-day, as any decent CMM zero team we switch to panic mode. We hotfix things in the release branch, and (re)release, then after the dust has settled merge back to trunk. And then see what was wrong with the hotfix.
No problem: you just need to record-only a merge of all the early revisions of the branch that you _don't_ want to merge back to trunk (like changesets that are merges from trunk themselves), and then you're set to easily merge all hotfixes back to trunk.
-- Stein
