On Thu, Feb 20, 2014 at 9:33 AM, Ziller Eike <[email protected]> wrote:
> > On Feb 20, 2014, at 7:42 AM, Orgad Shaneh <[email protected]> wrote: > > > Hi, > > > > I have a suggestion regarding the branching policy. > > > > I'll use master and 3.1 for reference, but it applies to following > branches of course. > > > > When master is branched out, you can allow a transition period (1-2 > weeks sounds reasonable), in which: > > * New changes will be pushed to 3.1. > > * Existing changes that target master, but belong to 3.1 will be > submitted to master > > * New/existing changes that target next master (3.2) will not be > submitted until the transition period is over. This is the hard part. You > can either count on approvers to (remember and) obey to this rule, or allow > submit (for master) only to release managers. > > * When the transition period if over, master will be merged into > 3.1, submit for master will be free, and any further changes that belong in > 3.1 will have to be resubmitted for it. > > What do you think? > > > > Alternative suggestion: Make someone fix / implement > https://code.google.com/p/gerrit/issues/detail?id=117 > > ;P > > -- > Eike Ziller, Senior Software Engineer - Digia, Qt > > Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin > Geschäftsführer: Mika Pälsi, Juha Varelius, Tuula Haataja > Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht > Charlottenburg, HRB 144331 B > > Gerrit 2.8 has a Cherry Pick button, which makes life a bit easier in this regard, but retargetting would definitely be useful. - Orgad
_______________________________________________ Qt-creator mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/qt-creator
