Re: [Development] Branches 5.4 and 5.4.2

2015-04-21 Thread Harri Pasanen
On 20/04/2015 20:17, Thiago Macieira wrote: > On Monday 20 April 2015 20:09:49 Harri Pasanen wrote: >> Does 5.4 have everything 5.4.2 has? >> >> Is there on-line some graphical view of the branches? > Yes but not always. The 5.4 branch will eventually have the full 5.4.2 > release, but until it clo

Re: [Development] Branches 5.4 and 5.4.2

2015-04-20 Thread Thiago Macieira
On Monday 20 April 2015 20:09:49 Harri Pasanen wrote: > Does 5.4 have everything 5.4.2 has? > > Is there on-line some graphical view of the branches? Yes but not always. The 5.4 branch will eventually have the full 5.4.2 release, but until it closes (when the release it happens), it may have a

[Development] Branches 5.4 and 5.4.2

2015-04-20 Thread Harri Pasanen
Does 5.4 have everything 5.4.2 has? Is there on-line some graphical view of the branches? Thanks, Harri ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Branches and time based releases

2014-03-10 Thread Frederik Gladhorn
Fredag 7. mars 2014 17.18.58 skrev Jan Kundrát: > On Tuesday, 25 February 2014 20:12:57 CEST, Thiago Macieira wrote: > > Also, I don't know of any project that has a CI-controlled integration. > > OpenStack. Full documentation on their setup (which, btw, tests each and > every commit separately) i

Re: [Development] Branches and time based releases

2014-03-07 Thread Jan Kundrát
On Tuesday, 25 February 2014 20:12:57 CEST, Thiago Macieira wrote: > Also, I don't know of any project that has a CI-controlled integration. OpenStack. Full documentation on their setup (which, btw, tests each and every commit separately) is available at http://ci.openstack.org/ . With kind rega

Re: [Development] Branches and time based releases

2014-03-07 Thread Oswald Buddenhagen
On Thu, Mar 06, 2014 at 08:46:19AM +0100, Knoll Lars wrote: > On 27/02/14 11:28, "Oswald Buddenhagen" wrote: > >to sum up: we agree with lars' proposal, except on this point. lars, > >feel like changing your mind? > > Ok, let’s try it and see what happens. We can always adjust as we go > forward.

Re: [Development] Branches and time based releases

2014-03-05 Thread Knoll Lars
On 27/02/14 11:28, "Oswald Buddenhagen" wrote: > >> > so to come back to the starting point: i think we should continue to >> > target the release branch directly. the burden for the developers >>isn't >> > very big (actually, one can even argue that the burden being there is >>a >> > good thing

Re: [Development] Branches and time based releases

2014-03-01 Thread Turunen Tuukka
Hi Uwe, Intention is that users could easier than before move to new minor releases. With Qt 4.x it has sometimes been hard for users to migrate to newer ones. We are still quite early with Qt 5 to know if this works. I fully agree that we should do more patch releases than we have done so far

Re: [Development] Branches and time based releases

2014-02-27 Thread Oswald Buddenhagen
On Tue, Feb 25, 2014 at 03:15:58PM -0800, Thiago Macieira wrote: > Em ter 25 fev 2014, às 22:06:44, Oswald Buddenhagen escreveu: > > > > A--B--C--D--E--F--> 5.3 > > > > \--C'--F' ^ shadow/v5.2 > > > > ^ v5.2 > > > [...] > > So let's agree not to implement this one? > ack > > co

Re: [Development] Branches and time based releases

2014-02-26 Thread Ziller Eike
On Feb 25, 2014, at 6:40 PM, Thiago Macieira wrote: > Em ter 25 fev 2014, às 11:33:00, Oswald Buddenhagen escreveu: >>> I.e., nothing changes. I propose this branch stay named "dev", for clarity >>> of purpose, not "master". >> >> i don't think the clarity buys us much. like the rest of the bra

Re: [Development] Branches and time based releases

2014-02-25 Thread Thiago Macieira
[sorry for resending; I had a race condition between the left hand pressing Ctrl+F1 to switch desktops and the right hand pressing Enter to add newlines...] Em ter 25 fev 2014, às 22:06:44, Oswald Buddenhagen escreveu: > > > > But I think you're suggesting something like this: > > > > > > > > A

Re: [Development] Branches and time based releases

2014-02-25 Thread Thiago Macieira
Em ter 25 fev 2014, às 22:06:44, Oswald Buddenhagen escreveu: > > > > But I think you're suggesting something like this: > > > > > > > > A--B--C--D--> 5.3 > > > > \--E--F > > > > > > no, i'm suggesting this: > > > A--B--C--D--E--F--> 5.3 > > > \--C'--F' ^ shadow/v5.2 > > >

Re: [Development] Branches and time based releases

2014-02-25 Thread Thiago Macieira
Em ter 25 fev 2014, às 15:50:39, Matthew Woehlke escreveu: > On 2014-02-25 14:12, Thiago Macieira wrote: > > Also, I don't know of any project that has a CI-controlled integration. > > What does that have to do with branch naming conventions? > > I'll grant that there is variance in the exact def

Re: [Development] Branches and time based releases

2014-02-25 Thread Oswald Buddenhagen
On Tue, Feb 25, 2014 at 11:28:46AM -0800, Thiago Macieira wrote: > Em ter 25 fev 2014, às 20:09:41, Oswald Buddenhagen escreveu: > > > If it passes reliably within half an hour, no lockdown is necessary. The > > > lockdown is only necessary today so the people doing the merging don't > > > have to

Re: [Development] Branches and time based releases

2014-02-25 Thread Matthew Woehlke
On 2014-02-25 14:12, Thiago Macieira wrote: > Also, I don't know of any project that has a CI-controlled integration. What does that have to do with branch naming conventions? I'll grant that there is variance in the exact definition of "master". Less so in the *existence* of the same. -- Matt

Re: [Development] Branches and time based releases

2014-02-25 Thread Thiago Macieira
Em ter 25 fev 2014, às 20:09:41, Oswald Buddenhagen escreveu: > > If it passes reliably within half an hour, no lockdown is necessary. The > > lockdown is only necessary today so the people doing the merging don't > > have to tear their hair out to keep track of two moving targets. > > eh? > the m

Re: [Development] Branches and time based releases

2014-02-25 Thread Thiago Macieira
Em ter 25 fev 2014, às 13:13:14, Matthew Woehlke escreveu: > To add an outsider perspective here... it's bad enough Qt doesn't follow > the conventions (a) used by (nearly) every other git repository in > existence and (b) unambiguously recommended by git itself. Are you referring to patches to th

Re: [Development] Branches and time based releases

2014-02-25 Thread Oswald Buddenhagen
On Tue, Feb 25, 2014 at 09:40:36AM -0800, Thiago Macieira wrote: > Em ter 25 fev 2014, às 11:33:00, Oswald Buddenhagen escreveu: > > > I.e., nothing changes. I propose this branch stay named "dev", for clarity > > > of purpose, not "master". > > > > otoh, the deviation from the default leads to *e

Re: [Development] Branches and time based releases

2014-02-25 Thread Matthew Woehlke
On 2014-02-25 12:40, Thiago Macieira wrote: > Em ter 25 fev 2014, às 11:33:00, Oswald Buddenhagen escreveu: >>> I.e., nothing changes. I propose this branch stay named "dev", for clarity >>> of purpose, not "master". >> >> i don't think the clarity buys us much. like the rest of the branch >> namin

Re: [Development] Branches and time based releases

2014-02-25 Thread Thiago Macieira
Em ter 25 fev 2014, às 11:33:00, Oswald Buddenhagen escreveu: > > I.e., nothing changes. I propose this branch stay named "dev", for clarity > > of purpose, not "master". > > i don't think the clarity buys us much. like the rest of the branch > naming stuff, it is really a minor detail for the ave

Re: [Development] Branches and time based releases

2014-02-25 Thread Thiago Macieira
Em ter 25 fev 2014, às 08:02:17, Uwe Rathmann escreveu: > last week we had the discussion about which version of Qt to use for a > new project. > > What we have seen with Qt5 so far were 5.x.0 releases that were time - > not quality - driven + only few maintenance releases ( 2 for 5.0, 1 for > 5.1

Re: [Development] Branches and time based releases

2014-02-25 Thread Oswald Buddenhagen
On Mon, Feb 24, 2014 at 02:22:49PM -0800, Thiago Macieira wrote: > Em seg 24 fev 2014, às 21:11:47, Knoll Lars escreveu: > > * We have one dev branch for all new development > > I.e., nothing changes. I propose this branch stay named "dev", for clarity of > purpose, not "master". > i don't think

Re: [Development] Branches and time based releases

2014-02-25 Thread Frederik Gladhorn
Mandag 24. februar 2014 14.22.49 skrev Thiago Macieira: > Em seg 24 fev 2014, às 21:11:47, Knoll Lars escreveu: I'll also only leave the relevant parts. > > * After creating the branch for a new minor release we do a forward merge > > from the previous branch before creating the alpha. The advant

Re: [Development] Branches and time based releases

2014-02-25 Thread Heikkinen Jani
> -Original Message- > From: development-bounces+jani.heikkinen=digia@qt-project.org > [mailto:development-bounces+jani.heikkinen=digia@qt-project.org] > On Behalf Of Thiago Macieira > Sent: 25. helmikuuta 2014 0:23 > To: development@qt-project.org > Subj

Re: [Development] Branches and time based releases

2014-02-25 Thread Uwe Rathmann
On Mon, 24 Feb 2014 21:11:47 +, Knoll Lars wrote: > So to sum it up, I believe the release model we currently have works > pretty well, certainly better than anything we have had in the past. Maybe I'm allowed to throw in the point of view of a user: last week we had the discussion about whi

Re: [Development] Branches and time based releases

2014-02-24 Thread Thiago Macieira
Em seg 24 fev 2014, às 21:11:47, Knoll Lars escreveu: > * We have one dev branch for all new development I.e., nothing changes. I propose this branch stay named "dev", for clarity of purpose, not "master". > * We create one branch for each minor release. This branch can be created > atomically f

Re: [Development] Branches and time based releases

2014-02-24 Thread Thiago Macieira
Em seg 24 fev 2014, às 21:11:47, Knoll Lars escreveu: > * Since the 5.x.y branches then only contain a very small (ideally 0) set > of changes that have been cherry-picked from 5.x, we can safely close that > branch after the release is out. Yes, this implies that there’s no > fast-forward from one

[Development] Branches and time based releases

2014-02-24 Thread Knoll Lars
Hi, there’s been quite a bit of discussions on both topics lately. I’ll sum up my thinking in a separate mail, as I think they are to some extent related. Let’s start with our release cycle. In my opinion (and having seen 15 years of doing Qt releases), our time based releasing model works better

Re: [Development] Branches

2012-12-13 Thread Oswald Buddenhagen
On Wed, Dec 12, 2012 at 10:24:46PM +0100, Knoll Lars wrote: > On Dec 12, 2012, at 5:39 PM, Oswald Buddenhagen > wrote: > > On Wed, Dec 12, 2012 at 07:59:07AM -0800, Thiago Macieira wrote: > >> On quarta-feira, 12 de dezembro de 2012 14.03.52, Oswald Buddenhagen wrote: > >>> On Mon, Dec 03, 2012 a

Re: [Development] Branches

2012-12-12 Thread Knoll Lars
On Dec 12, 2012, at 5:39 PM, Oswald Buddenhagen wrote: > On Wed, Dec 12, 2012 at 07:59:07AM -0800, Thiago Macieira wrote: >> On quarta-feira, 12 de dezembro de 2012 14.03.52, Oswald Buddenhagen wrote: >>> On Mon, Dec 03, 2012 at 04:29:24PM +, Knoll Lars wrote: master is closed for new

Re: [Development] Branches

2012-12-12 Thread Oswald Buddenhagen
On Wed, Dec 12, 2012 at 07:59:07AM -0800, Thiago Macieira wrote: > On quarta-feira, 12 de dezembro de 2012 14.03.52, Oswald Buddenhagen wrote: > > On Mon, Dec 03, 2012 at 04:29:24PM +, Knoll Lars wrote: > > > master is closed for new pushes and will go away in a couple of weeks by > > > the lat

Re: [Development] Branches

2012-12-12 Thread Thiago Macieira
On quarta-feira, 12 de dezembro de 2012 14.03.52, Oswald Buddenhagen wrote: > On Mon, Dec 03, 2012 at 04:29:24PM +, Knoll Lars wrote: > > master is closed for new pushes and will go away in a couple of weeks by > > the latest. > this has happened now - the master branches are all deleted. > >

Re: [Development] Branches

2012-12-12 Thread Oswald Buddenhagen
On Mon, Dec 03, 2012 at 04:29:24PM +, Knoll Lars wrote: > master is closed for new pushes and will go away in a couple of weeks by the > latest. > this has happened now - the master branches are all deleted. due to the mess found in the master branches, i simply deleted them without merging

Re: [Development] Branches

2012-12-04 Thread Lincoln Ramsay
On 04/12/12 18:28, Martin Smith wrote: > What about changes to qdoc? It doesn't have autotests. There's a first time for everything ;) -- Link ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/develop

Re: [Development] Branches

2012-12-04 Thread Martin Smith
On Dec 3, 2012, at 11:46 PM, Lincoln Ramsay wrote: > On 04/12/12 02:29, Knoll Lars wrote: >> since there has been some confusion about the branches we created, let me >> try to clarify > > ... and document on a wiki or something? For the people that won't see > this email but might search for

Re: [Development] Branches

2012-12-03 Thread Lincoln Ramsay
On 04/12/12 02:29, Knoll Lars wrote: > since there has been some confusion about the branches we created, let me try > to clarify ... and document on a wiki or something? For the people that won't see this email but might search for this info? And for the people that don't look but need the rem

Re: [Development] Branches

2012-12-03 Thread Thiago Macieira
On segunda-feira, 3 de dezembro de 2012 14.44.12, Rafael Roquetto wrote: > > * Changes have to be source and binary compatible (until 5.0.0 is out, I > > can approve exceptions. But you'll need extremely good reasons) > > * No new methods and classes can be added > > Does it also apply for QPA pl

Re: [Development] Branches

2012-12-03 Thread Rafael Roquetto
Hi Lars, On Mon, Dec 03, 2012 at 04:29:24PM +, Knoll Lars wrote: > Hi, > Stable: > > This branch will be the basis for Qt 5.0 and subsequent patch level releases. > The following policies apply here: > > * Changes have to be source and binary compatible (until 5.0.0 is out, I can > approv

[Development] Branches

2012-12-03 Thread Knoll Lars
Hi, since there has been some confusion about the branches we created, let me try to clarify. We currently have three branches: dev, stable and master. Dev: Dev is the branch where you can land anything that's supposed to go into 5.1. The following policies apply: * Changes have to be source