lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: GOP-PROP 12: keep master in ready-to-release state (probabledecision


From: Trevor Daniels
Subject: Re: GOP-PROP 12: keep master in ready-to-release state (probabledecision)
Date: Fri, 23 Sep 2011 22:01:54 +0100


David Kastrup wrote Friday, September 23, 2011 10:17 AM
Subject: Re: GOP-PROP 12: keep master in ready-to-release state (probabledecision)


"Trevor Daniels" <address@hidden> writes:

My preference is for a single staging branch. Major patches would be pushed there rather than to master after a successful Reitfeld review, and only cherry-picked to master after successful tests (eg doc build)
by someone authorised to do so.

I am not sure cherry-picking is the way to go. The main point of a staging branch is that you can do a full doc and reg test for a bunch of
changes together.

Exactly.  With the current rate of pushing patches
it is not feasible to check all of them individually.

When cherry-picking, this becomes more difficult.

What I had in mind, but didn't elaborate, was to run
the full suite of tests on the staging branch.  If
they succeed then all patches can be merged to master.
If there is a failure (hopefully not too often) then
individual (groups of) patches would need to be checked
and the successful ones cherry-picked, as you describe:

Basically a staging master would then to have to cherry-pick to his private staging branch (tracking origin/master), make full builds and verifications, then push (only fast-forward!). Afterwards rebase the public staging branch on master and push, so that all committed changes
will no longer be present.

As you said elsewhere, it's the changes which are believed
to be trivial that cause the most problems, so using
separate dev branches for just the major changes, with
"trivial" patches being pushed direct to master will not
help.  All patches need to go through the mill, and
the quantity of them means batching them via a staging
branch.

Trevor



-----
No virus found in this message.
Checked by AVG - www.avg.com
Version: 10.0.1410 / Virus Database: 1520/3914 - Release Date: 09/23/11




reply via email to

[Prev in Thread] Current Thread [Next in Thread]