Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-10-04 Thread Konstantin Tokarev
04.10.2016, 14:04, "Edward Welbourne" : > Marc Mutz said: >>  I just came to realise another reason against cherry-picking: >> >>  Qt 5.6 is C++98-only while 5.7+ is C++11. That means patches that will >>  be developed against 5.7+ will very likely have C++11 constructs

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-10-04 Thread Edward Welbourne
Marc Mutz said: > I just came to realise another reason against cherry-picking: > > Qt 5.6 is C++98-only while 5.7+ is C++11. That means patches that will > be developed against 5.7+ will very likely have C++11 constructs in > them that won't work in Qt 5.6. Conversely, code developed in 5.6

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-10-01 Thread Marc Mutz
On Thursday 08 September 2016 09:12:32 Marc Mutz wrote: > On Wednesday 07 September 2016 08:37:01 Friedemann Kleint wrote: > > ** After 5.7 is closed and sanity bot is upgraded (to handle > > cherry-picking), go into cherrypicking mode for 5.6. Developer is > > responsible for doing the

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-23 Thread Oswald Buddenhagen
On Thu, Sep 22, 2016 at 09:41:29AM +0200, Marc Mutz wrote: > On Thursday 22 September 2016 08:55:13 Liang Qi wrote: > > Give the merge permission to everyone is obiviously not a solution. > > Not everyone, but approvers, maybe? Merges need to be reviewed like any other > commit, so why are they

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-22 Thread Edward Welbourne
On Thursday 22 September 2016 08:55:13 Liang Qi wrote: >> Give the merge permission to everyone is obiviously not a solution. Marc Mutz replied: > Not everyone, but approvers, maybe? Merges need to be reviewed like > any other commit, so why are they special, anyway? Do we at least give all

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-22 Thread Marc Mutz
On Thursday 22 September 2016 08:55:13 Liang Qi wrote: > Give the merge permission to everyone is obiviously not a solution. Not everyone, but approvers, maybe? Merges need to be reviewed like any other commit, so why are they special, anyway? Thanks, Marc -- Marc Mutz |

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-22 Thread Liang Qi
On 12 September 2016 at 11:20, Edward Welbourne wrote: > Marc Mutz said: > > The obvious question is, then, why is only "the one person" doing merges? > > Allow more people to upload merges, and you will get the spreading you > desire. > > Several people can upload

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-12 Thread Edward Welbourne
Marc Mutz said: > The obvious question is, then, why is only "the one person" doing merges? > Allow more people to upload merges, and you will get the spreading you desire. Several people can upload merges. One person looks after integration in qt5 and all its sub-modules. We can spread the load

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-10 Thread Thiago Macieira
On sábado, 10 de setembro de 2016 09:21:58 PDT Marc Mutz wrote: > (and the less obvious one: why are changes to the config system done in 5.8, > and not LTS? They don't touch code, after all). You mean the complete rewrite of configure and configure.exe, with a huge chunk of new qmake code that

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-10 Thread Konstantin Tokarev
10.09.2016, 15:32, "Marc Mutz" : > Hi Lars, > > On Friday 09 September 2016 15:21:04 Lars Knoll wrote: >>  A cherry-picking approach for the LTS branch can make sense, as it >>  distributes the burden of bringing the bug fix to both the stable and LTS >>  branch over all

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-10 Thread Marc Mutz
Hi Lars, On Friday 09 September 2016 15:21:04 Lars Knoll wrote: > A cherry-picking approach for the LTS branch can make sense, as it > distributes the burden of bringing the bug fix to both the stable and LTS > branch over all developers and doesn’t put it on the one person having to > do the

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-09 Thread Lars Knoll
On 08/09/16 17:13, "Development on behalf of Thiago Macieira" wrote: >On quinta-feira, 8 de setembro de 2016 07:37:28 PDT Liang Qi wrote: >> Is it better to have 5.7.2 around 5.8.0 final release and

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-08 Thread Thiago Macieira
On quinta-feira, 8 de setembro de 2016 07:37:28 PDT Liang Qi wrote: > Is it better to have 5.7.2 around 5.8.0 final release and close 5.7 after > that? 5.7.1 is very soon in a few weeks. There will be a few months gap > between 5.7.1 and 5.8.0/5.8.1. The first release of new branch, like 5.8.0, >

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-08 Thread Oswald Buddenhagen
On Thu, Sep 08, 2016 at 12:25:02PM +0200, Liang Qi wrote: > This is mainly because we did heavy refactoring in upstream branches, > "upstream" makes no sense whatsoever. merge-wise, it's exactly the wrong way around. "younger" as used elsewhere in this thread is better. > for example, rewriting

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-08 Thread Liang Qi
On 8 September 2016 at 09:36, Alexander Blasche wrote: > > From: Marc Mutz > > >On Wednesday 07 September 2016 08:37:01 Friedemann Kleint wrote: > >> ** After 5.7 is closed and sanity bot is upgraded (to

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-08 Thread Alexander Blasche
From: Marc Mutz >On Wednesday 07 September 2016 08:37:01 Friedemann Kleint wrote: >> ** After 5.7 is closed and sanity bot is upgraded (to handle >> cherry-picking), go into cherrypicking mode for 5.6. Developer is >> responsible for

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-08 Thread Marc Mutz
On Wednesday 07 September 2016 08:37:01 Friedemann Kleint wrote: > ** After 5.7 is closed and sanity bot is upgraded (to handle > cherry-picking), go into cherrypicking mode for 5.6. Developer is > responsible for doing the cherrypicking > ** Cherry-picking technicalities need to be figured out:

Re: [Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-08 Thread Liang Qi
On 7 September 2016 at 08:37, Friedemann Kleint wrote: > Hi, > > the notes are at: https://wiki.qt.io/QtCS2016_Managing_Qt_Branches > > * Number of existing branches (5.6LTS, 5.7.,5.8 dev) causes a number of > problems > > ** Strain on COIN which also has release

[Development] Notes on "Managing Qt's branches" session @ QCS 2016

2016-09-07 Thread Friedemann Kleint
Hi, the notes are at: https://wiki.qt.io/QtCS2016_Managing_Qt_Branches * Number of existing branches (5.6LTS, 5.7.,5.8 dev) causes a number of problems ** Strain on COIN which also has release branches ** Merging becomes increasingly difficult ** Hard to manage for individual developers *