[Development] Merging patches to old/5.0 or old/5.1 branches

Oswald Buddenhagen oswald.buddenhagen at digia.com
Mon Nov 4 17:25:46 CET 2013

On Mon, Nov 04, 2013 at 08:18:14AM -0800, Thiago Macieira wrote:
> On segunda-feira, 4 de novembro de 2013 12:18:22, Allan Sandfeld Jensen wrote:
> > The biggest problem I see with these branches is that they do not have any 
> > bots testing it, so we need to be extra careful with merging patches. I 
> > suggest a policy of only merging patches that are already fully integrated 
> > into the newer trees, and which fixes new platforms, or fixes bugs on 
> > platforms or feature combinations that should work but wasn't fully tested
> > at  release, and of course security fixes, but we will do new releases if
> > those pop up. Additionally we should require at least two +2 reviews before
> > merging.
> I agree with this.
so we make them cherry-pick branches without CI. what then? would you
insist on forward-merging them to stable?

More information about the Development mailing list