Hi there, On Wed, Oct 03, 2012 at 07:49:38PM +0000, Turunen Tuukka wrote: > > >> Thus I think we have two options with the 4.8.3-1: > >> > >> 1. Include the copyright change and MinGW fix > >> 2. Include only the copyright changes and fix MinGW in the next patch > >> release > >> 3. Call it 4.8.4 and accept that it can not be fetched from the > >> repository > > > >4. Call it 4.8.4, apply the copyright change and the MinGW fix and merge it > >back to the 4.8 branch. > > I still think there is a bit too much hassle to get in the copyright changes > (they touch about every file) but take out a rather large number of changes > that are done after 4.8.3 but before the copyright changes. > > For that reason we have prepared a similar copyright changes source file > manually based on 4.8.3. It is now in testing and we would be soon ready to > release it. > > As said, the reason to do this are the fact that we have to do the copyright > change, but wish to minimize the work and concentrate on Qt 5.0. Later when > we do the 'real' 4.8.4 the copyrights are right as they are changes in the > repo. > > So my preference is still to pick one of the options #1 - #3.
What's the problem of "branching" 4.8.3, cherry-picking 619136931e2c985377348d196d488e429a4858d6 (is that the right patch?), and tagging it as 4.8.4? As for the MingW patch, wouldn't that be a completely different thing? If it is critical and has to go on the release anyway, how dependant is this patch on the post 4.8.3 changes? Would it be that hard to cherry-pick it as Thiago suggested? Apologies if I am missing something. Cheers, 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
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
