On Friday, February 22, 2013 15:39:57 Oswald Buddenhagen wrote: > On Fri, Feb 22, 2013 at 03:11:14PM +0100, Stephen Kelly wrote: > > I misunderstood the branch situation for Qt 5.0.2, and I pushed commits to > > stable which need to be in 5.0.2 (specifically > > 7661e39c022f76da34fcd5d38ecb93c86e01f1b7 and > > 7477d50fce9a0008ff4e050285e146ebc0c1e163 which fix a regression introduced > > in 316d8ececa3314ec16baf46ec4f1c5440cd951ef). > > > > Without those patches the cmake files are unusable, so they need to be in > > 5.0.2. > > > > The easiest way I can see to fix that situation is to fast-forward the > > release branch to 7661e39c022f76da34fcd5d38ecb93c86e01f1b7. As it is a > > fast-forward, all commits have already been through CI. > > i fast-forwarded the branch with akseli's permission after reviewing > what i'd push. > however, this was most definitely an exception, because it looked > harmless and the release testing didn't really start yet.
Great, thanks for that. I know I got lucky this time. -- Stephen Kelly <[email protected]> | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
