04.12.2012, 19:56, "Pau Garcia i Quiles" <[email protected]>: > On Tue, Dec 4, 2012 at 11:56 AM, Oswald Buddenhagen > <[email protected]> wrote: >> On Tue, Dec 04, 2012 at 07:53:41AM +0000, Vladimir Minenko wrote: >>> > After yesterdays release we are planning to bump the Qt 4 version to >>> > 4.8.5. >>> >>> Guys, would it be a big problem to wait with this until the end of this >>> week? We are releasing the final NDK this week and a change in the version >>> is will cause trouble. We will definitely revert it internally which will >>> bring Qt in the NDK out of sync with the upstream Qt... >>> >> i don't get your reasoning. the branch already has additional commits, >> so whatever you release, it's *not* stock 4.8.4, and you are doing >> everyone a disservice claiming it. and once you accept that it's >> 4.8.4-rim, it doesn't matter what the version in the repository says, as >> you need to change it anyway. > This is why at work we use a different branching model, also based on gitflow > but with differences. > For instance, for each major release, we have a release-x.y-stabilization and > a release-x.y-releases. In this case, RIM would have taken 4.8.4 from > release-x.y-releases instead of master. Picture attached.
There's no point in keeping separate branch purely for tags. It is just an unnecessary overcomplication. -- Regards, Konstantin _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
