Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
> On 06 Jun 2014, at 12:23, Oswald Buddenhagen > wrote: > >> On Fri, Jun 06, 2014 at 11:38:34AM +0200, Kurt Pattyn wrote: >> Just for clarity: >> * Is the release branch gone for developers? > it's gone for everyone. it has been deleted. > the next release branch will be 5.3.1, and you will push for it if you > have critical changes for that release. just as before. > >> * And is there only one dev branch? Suppose 5.4 is in the make and meanwhile >> a 5.3.x patch release is being worked upon, >> where will the dev branch end up? Or should we just push our patches to the >> 5.3.x in that case? > uhm ... huh? > > i'm amazed by what twisted ideas people come up, given that we are > switching to a branching model which almost every other project on the > planet uses, including qt creator ... Well, a picture says more than a thousand words. A simple drawing with a Qt 5.x and Qt 5.x+1 branch and a 'future' Qt 6.x branch, together with stable and dev branches would clarify a lot. Suppose we want to work on a maintenance release of 5.x while 6.x is in the field: how will the branches look like? > > now on to hacking the wiki ... > >> Cheers, >> >> Kurt >> >>> On 06 Jun 2014, at 08:37, Knoll Lars wrote: >>> On 06/06/14 08:20, "Thiago Macieira" wrote: > Em sex 06 jun 2014, às 14:00:19, Yuchen Deng escreveu: > I'd say, the 'dev' even does not be a complete words. so run a poll > sounds > be fair. Let's run at QtCS next week. I don't think we'll ever get a better sampling of people involved in Qt development. Someone who feels strongly about the renaming should conduct a quick show of hands during the plenary session. >>> >>> I don’t see why we’d need to rename dev. Nothing has changed for that >>> branch. It has exactly the same meaning as before, and the same workflow. >>> >>> We have changed the other ones because we have a different scheme how we >>> create these branches and merge between them. >>> >>> And for those confused where to push their changes: >>> >>> * If you were before pushing to dev, continue to do so. >>> * If you were pushing to stable, push to 5.3 (Later on, you might have a >>> choice of pushing to 5.3 or 5.4 depending on whether it’s critical enough >>> to do another release of 5.3 as well once we have 5.4 out). >>> * If we have a 5.x.y branch available (because we’re in the process of >>> preparing a release), and you have a fix for a showstopper for that >>> release, push to the 5.x.y branch. >>> >>> Cheers, >>> Lars >>> >>> ___ >>> Development mailing list >>> Development@qt-project.org >>> http://lists.qt-project.org/mailman/listinfo/development >> >> ___ >> Development mailing list >> Development@qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > ___ > Development mailing list > Development@qt-project.org > http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
On Fri, Jun 06, 2014 at 11:38:34AM +0200, Kurt Pattyn wrote: > Just for clarity: > * Is the release branch gone for developers? > it's gone for everyone. it has been deleted. the next release branch will be 5.3.1, and you will push for it if you have critical changes for that release. just as before. > * And is there only one dev branch? Suppose 5.4 is in the make and meanwhile > a 5.3.x patch release is being worked upon, > where will the dev branch end up? Or should we just push our patches to the > 5.3.x in that case? > uhm ... huh? i'm amazed by what twisted ideas people come up, given that we are switching to a branching model which almost every other project on the planet uses, including qt creator ... now on to hacking the wiki ... > Cheers, > > Kurt > > On 06 Jun 2014, at 08:37, Knoll Lars wrote: > > > On 06/06/14 08:20, "Thiago Macieira" wrote: > > > >> Em sex 06 jun 2014, às 14:00:19, Yuchen Deng escreveu: > >>> I'd say, the 'dev' even does not be a complete words. so run a poll > >>> sounds > >>> be fair. > >> > >> Let's run at QtCS next week. I don't think we'll ever get a better > >> sampling of > >> people involved in Qt development. > >> > >> Someone who feels strongly about the renaming should conduct a quick show > >> of > >> hands during the plenary session. > > > > I don’t see why we’d need to rename dev. Nothing has changed for that > > branch. It has exactly the same meaning as before, and the same workflow. > > > > We have changed the other ones because we have a different scheme how we > > create these branches and merge between them. > > > > And for those confused where to push their changes: > > > > * If you were before pushing to dev, continue to do so. > > * If you were pushing to stable, push to 5.3 (Later on, you might have a > > choice of pushing to 5.3 or 5.4 depending on whether it’s critical enough > > to do another release of 5.3 as well once we have 5.4 out). > > * If we have a 5.x.y branch available (because we’re in the process of > > preparing a release), and you have a fix for a showstopper for that > > release, push to the 5.x.y branch. > > > > Cheers, > > Lars > > > > ___ > > Development mailing list > > Development@qt-project.org > > http://lists.qt-project.org/mailman/listinfo/development > > ___ > Development mailing list > Development@qt-project.org > http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Just for clarity: * Is the release branch gone for developers? * And is there only one dev branch? Suppose 5.4 is in the make and meanwhile a 5.3.x patch release is being worked upon, where will the dev branch end up? Or should we just push our patches to the 5.3.x in that case? Cheers, Kurt On 06 Jun 2014, at 08:37, Knoll Lars wrote: > On 06/06/14 08:20, "Thiago Macieira" wrote: > >> Em sex 06 jun 2014, às 14:00:19, Yuchen Deng escreveu: >>> I'd say, the 'dev' even does not be a complete words. so run a poll >>> sounds >>> be fair. >> >> Let's run at QtCS next week. I don't think we'll ever get a better >> sampling of >> people involved in Qt development. >> >> Someone who feels strongly about the renaming should conduct a quick show >> of >> hands during the plenary session. > > I don’t see why we’d need to rename dev. Nothing has changed for that > branch. It has exactly the same meaning as before, and the same workflow. > > We have changed the other ones because we have a different scheme how we > create these branches and merge between them. > > And for those confused where to push their changes: > > * If you were before pushing to dev, continue to do so. > * If you were pushing to stable, push to 5.3 (Later on, you might have a > choice of pushing to 5.3 or 5.4 depending on whether it’s critical enough > to do another release of 5.3 as well once we have 5.4 out). > * If we have a 5.x.y branch available (because we’re in the process of > preparing a release), and you have a fix for a showstopper for that > release, push to the 5.x.y branch. > > Cheers, > Lars > > ___ > Development mailing list > Development@qt-project.org > http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
On 06/06/14 08:20, "Thiago Macieira" wrote: >Em sex 06 jun 2014, às 14:00:19, Yuchen Deng escreveu: >> I'd say, the 'dev' even does not be a complete words. so run a poll >>sounds >> be fair. > >Let's run at QtCS next week. I don't think we'll ever get a better >sampling of >people involved in Qt development. > >Someone who feels strongly about the renaming should conduct a quick show >of >hands during the plenary session. I don’t see why we’d need to rename dev. Nothing has changed for that branch. It has exactly the same meaning as before, and the same workflow. We have changed the other ones because we have a different scheme how we create these branches and merge between them. And for those confused where to push their changes: * If you were before pushing to dev, continue to do so. * If you were pushing to stable, push to 5.3 (Later on, you might have a choice of pushing to 5.3 or 5.4 depending on whether it’s critical enough to do another release of 5.3 as well once we have 5.4 out). * If we have a 5.x.y branch available (because we’re in the process of preparing a release), and you have a fix for a showstopper for that release, push to the 5.x.y branch. Cheers, Lars ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Em sex 06 jun 2014, às 13:50:07, Yuchen Deng escreveu: > The people know the 'release' & 'stable' branch for a long time TOO. > but it will gone for soon. right? They will be gone not because they are confusing and people didn't know what they mean. They are being replaced so that we have a different workflow that should make the lives of people doing feature freezes and branching easier. None of the workflow changes when it comes to the branch containing the next version. > so, Why 'release' & 'stable' need to gone because some reasons, but 'dev' > does not? and we have a reason: better understand for many people will > touch Qt in future. That's not the reason. See above. > If we need to change the branching scheme, we should change all of them. That's a poor argument. > > 2014-06-06 13:32 GMT+08:00 Thiago Macieira : > > The people who need to know what it is already know. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Em sex 06 jun 2014, às 14:00:19, Yuchen Deng escreveu: > I'd say, the 'dev' even does not be a complete words. so run a poll sounds > be fair. Let's run at QtCS next week. I don't think we'll ever get a better sampling of people involved in Qt development. Someone who feels strongly about the renaming should conduct a quick show of hands during the plenary session. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
I'd say, the 'dev' even does not be a complete words. so run a poll sounds be fair. 2014-06-06 13:54 GMT+08:00 Hausmann Simon : > Whether or not next is a better name than dev is your opinion, it isn't > necessarily a fact. I for one like dev and find it a name better than next. > > We could run a poll and see what name comes out and change to that. > -- Best Regards Yuchen ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Whether or not next is a better name than dev is your opinion, it isn't necessarily a fact. I for one like dev and find it a name better than next. We could run a poll and see what name comes out and change to that. But is it really worth the effort and disruption? I'm not convinced that it is. Simon Fra: Yuchen Deng Sendt: 07:23 fredag 6. juni 2014 Til: Thiago Macieira Kopi: development Emne: Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated I think 'next' work tell people, it's the next release, for now it's unstable. But 'dev' don't tell people anything. Because all of the branch should being develop state. except the release branch, e.g. '5.3.x'. Why this 'dev' branch is special? Why don't use a better name? 2014-06-05 23:31 GMT+08:00 Thiago Macieira mailto:thiago.macie...@intel.com>>: I don't see the point in renaming from "dev" to "next". It doesn't buy anything new, other than confusion. -- Best Regards Yuchen ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
The people know the 'release' & 'stable' branch for a long time TOO. but it will gone for soon. right? so, Why 'release' & 'stable' need to gone because some reasons, but 'dev' does not? and we have a reason: better understand for many people will touch Qt in future. If we need to change the branching scheme, we should change all of them. 2014-06-06 13:32 GMT+08:00 Thiago Macieira : > The people who need to know what it is already know. -- Best Regards Yuchen ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Em sex 06 jun 2014, às 13:22:28, Yuchen Deng escreveu: > I think 'next' work tell people, it's the next release, for now it's > unstable. > But 'dev' don't tell people anything. > Because all of the branch should being develop state. except the release > branch, e.g. '5.3.x'. > Why this 'dev' branch is special? > Why don't use a better name? The people who need to know what it is already know. Changing it now would add unnecessary confusion for no gain. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
I think 'next' work tell people, it's the next release, for now it's unstable. But 'dev' don't tell people anything. Because all of the branch should being develop state. except the release branch, e.g. '5.3.x'. Why this 'dev' branch is special? Why don't use a better name? 2014-06-05 23:31 GMT+08:00 Thiago Macieira : > I don't see the point in renaming from "dev" to "next". It doesn't buy > anything new, other than confusion. > -- Best Regards Yuchen ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Sergio, many thanks.. BR, Denis 05.06.2014 19:00, Sergio Ahumada пишет: > Hi, > > On 05.06.2014 16:52, Denis Shienkov wrote: >> Hi, >> >> I found it a little not clear: >> >> > the stable branches will continue to exist for the next weeks >> >> but after week, where to need to do push new changes? in /5.3.2 ? /dev? :) > see below > >> > however, do not push new reviews for/stable >> >> but where then to do push for new reviews? > AFAIU > > 5.3.1 => refs/for/5.3 (for now, refs/for/5.3.1 when it's available) > 5.3.2 => refs/for/5.3 (after the 5.3.1 branch is created and 5.3 bumped) > 5.4.0 => refs/for/dev > > only amends to current changes already in gerrit for 5.3.1 should go to > stable > >> BR, >> Denis > I think it should be really nice to get this documented :) > > Cheers, ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Em qui 05 jun 2014, às 23:05:11, Yuchen Deng escreveu: > Why do not change the 'dev' branch to 'next' ? or, just '5.4' instead? > I don't got it for new branching scheme. I don't see the point in renaming from "dev" to "next". It doesn't buy anything new, other than confusion. Renaming to "5.4" has some merits, but it would mean we need to create 5.5 from it instead and it would mean you can't track any long-term development branch. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Why do not change the 'dev' branch to 'next' ? or, just '5.4' instead? I don't got it for new branching scheme. 2014-06-05 23:00 GMT+08:00 Sergio Ahumada : > 5.4.0 => refs/for/dev -- Best Regards Yuchen ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Hi, On 05.06.2014 16:52, Denis Shienkov wrote: > Hi, > > I found it a little not clear: > > > the stable branches will continue to exist for the next weeks > > but after week, where to need to do push new changes? in /5.3.2 ? /dev? :) see below > > however, do not push new reviews for/stable > > but where then to do push for new reviews? AFAIU 5.3.1 => refs/for/5.3 (for now, refs/for/5.3.1 when it's available) 5.3.2 => refs/for/5.3 (after the 5.3.1 branch is created and 5.3 bumped) 5.4.0 => refs/for/dev only amends to current changes already in gerrit for 5.3.1 should go to stable > BR, > Denis I think it should be really nice to get this documented :) Cheers, -- Sergio Ahumada sahum...@blackberry.com ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated
Hi, I found it a little not clear: > the stable branches will continue to exist for the next weeks but after week, where to need to do push new changes? in /5.3.2 ? /dev? :) > however, do not push new reviews for/stable but where then to do push for new reviews? BR, Denis 2014-06-05 18:39 GMT+04:00 Oswald Buddenhagen : > hello, > > we finally have CI setups for the new branching scheme. this means that > 5.3 (and 1.0 in enginio) are now the target branches for stabilization > changes aimed at the 5.3.1 release. > > the stable branches will continue to exist for the next weeks and will > be merged into 5.3/1.0 regularly, so you can finish and integrate your > pending reviews. > > do *NOT* re-push your pending changes for/5.3. > > however, do not push new reviews for/stable (this can't be technically > prevented without preventing amends to existing changes, so i'm leaving > it open for the time being). > ___ > Development mailing list > Development@qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
