On 19/01/2012 12:55, ext Robin Burchell wrote: > On Thu, Jan 19, 2012 at 8:32 PM, Oswald Buddenhagen > <oswald.buddenha...@nokia.com> wrote: >> On Thu, Jan 19, 2012 at 08:24:22PM +0200, ext Robin Burchell wrote: >>> On Thu, Jan 19, 2012 at 8:15 PM, Oswald >>> Buddenhagen<oswald.buddenha...@nokia.com> wrote: >>>> i made an attempt to give the digia group on gerrit the right to create >>>> the branch 4.7-digia >>> >>> why not just put it in 4.7, so they're one and the same, >>> >> because they *aren't* the same. the digia patches are not >> community-approved by the respective domain experts. the qt project >> cannot simply accept this, be if for trademark reasons. > > yup, and while that's a bad situation, if you leave them in a branch > instead of (somehow) encouraging them to merge backwards, you're only > going to encourage that split to stay that way. people (including > distros) will have no choice but to use the digia version. it's not > helping.
They can be pushed to a 4.7-digia branch, then upon review, be cherry-picked into the 4.7 (MCL) branch. New releases should be forged on the 4.7 MCL with patches hopefully accepted directly into the 4.7 branch before the actual release. -- .marius _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development