[Development] Merging Qt 5.3 branch into dev branch

[Frederik Gladhorn]

Hello BogDan,

https://codereview.qt-project.org/#/c/91373/ is hopefully what you want. As 
you can see it's been there since yesterday. Feel free to look at my dashboard 
and review merges or tell me if there is none  yet.

I just can't do magic or bypass the CI.

Cheers,
Frederik


On Monday, August 04, 2014 11:01:17 PM BogDan wrote:
> Hi Frederik,
> 
> 
> Pretty please with sugar on top, do a merge quicker. My patches add new
> features to Qt 5.4 and there are just a few days until feature freeze.
> 
> 
> Cheers,
> BogDan.
> 
> 
> Hi,
> 
> On Monday, August 04, 2014 07:23:46 AM BogDan wrote:
> > Hello,
> > 
> > Is there any chance to have a more often merging of 5.3 branch into dev?
> > I have a few pending patches for dev branch which depends on others that I
> > pushed to 5.3 branch a few days ago.
> 
> I usually try to do a merge roughly every 1-2 weeks, depending on the amount
> of patches. Then it also takes a while to get the merge integrated, just
> like any other patch.
> 
> Feel free to ask on irc or via mail when you need a merge quickly, usually I
> or someone else can do this.
> 
> I don't think we need more merges, they just clutter the  history. Of course
> waiting too long is bad as well and conflicts just pile up.
> 
> Greetings,
> Frederik
> 
> > Cheers,
> > BogDan.
> > 
> > _______________________________________________
> > Development mailing list
> > Development at qt-project.org
> > http://lists.qt-project.org/mailman/listinfo/development