Since the major/minor/patch release is encoded into QT_VERSION, critical releases should increment the patch number. I suggest to use a short lived branch for just this release.
e.g. check out previous patch release tag (e.g. v4.8.3) create a branch from it cherry pick the critical fix(es) onto the branch cherry pick the QT_VERSION update to the branch tag the head of the branch with the new release (e.g. v4.8.4) close the branch push a QT_VERSION update to the main branch (e.g. 4.8) to update the QT_VERSION to the next release (e.g. 4.8.5) The git history would look something like this: O | O-v4.8.3 |\ O O | | O O-v4.8.4 | ... | O-v4.8.5 -- > -----Original Message----- > From: [email protected] > [mailto:[email protected]] > On Behalf Of Rafael Roquetto > Sent: 05 October 2012 15:33 > To: [email protected] > Subject: [Development] How to release critical fixes? > > Hello all, > > Following the discussion concerning 4.8.3-1 vs 4.8.4, I think an > important gap on the workflow has been exposed: how to release critical > patches? I am not sure if this makes sense, since I am entirely not > acquitanted to the entire release process, but would anyone have any > suggestion or comments on how we could issue these exceptional releases > that should only include highly critical fixes (i.e. the SSL one)? > Feedback? > > Thanks, > Rafael > -- > ** Qt Developer Conference: http://qtconference.kdab.com/ ** > > Rafael Roquetto | [email protected] | Software Engineer > Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) > +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform- > independent software solutions Subject to local law, communications with Accenture and its affiliates including telephone calls and emails (including content), may be monitored by our systems for the purposes of security and the assessment of internal compliance with Accenture policy. ______________________________________________________________________________________ www.accenture.com _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
