Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59562
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain managedit.ie designates 209.85.212.42 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAKOpQSxvCFK+r==tgYrphepww6tnEeN=MFd_ZSTK=3=--MPAyA@mail.gmail.com>
References: <4F82878A.6030609@sugarcrm.com> <CAGSj+Qv+r2674T=N7zC0DhC9Xy1+6FVLw7+MYusA9pwESHBZzQ@mail.gmail.com>
 <CAKOpQSxMTUykqL1pBsfVWsYZ3rTZi7gOsrbk1yKk8ywSUbf1SA@mail.gmail.com>
 <4F834F94.1000002@sugarcrm.com> <CAKOpQSxvCFK+r==tgYrphepww6tnEeN=MFd_ZSTK=3=--MPAyA@mail.gmail.com>
Date: Mon, 9 Apr 2012 22:33:32 +0100
Message-ID: <CAGSj+Qsr1xzdqJS1sxst8NwFO8XyE4RT9vpXqHKozj4w+MwbCg@mail.gmail.com>
To: Kris Craig <kris.craig@gmail.com>
Cc: Stas Malyshev <smalyshev@sugarcrm.com>, PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=bcaec519650945057c04bd45c3d6
Subject: Re: [PHP-DEV] release process with git
From: kiall@managedit.ie (Kiall Mac Innes)

--bcaec519650945057c04bd45c3d6
Content-Type: text/plain; charset=ISO-8859-1

On Mon, Apr 9, 2012 at 10:27 PM, Kris Craig <kris.craig@gmail.com> wrote:
>
> What I'm referring to is the same kind of bugfixes/etc that go into new
> release candidates.  I mean, we're still planning on having multiple
> release candidates before an actual release, right?  If so, then obviously
> we'll need a way to commit those changes.  If they're not made on the RC
> branch, then where were you thinking they should go, and how would we then
> apply those bugfixes to the 5.4 trunk if not through a merge?


Referring again to how openstack manages this (because I personally feel
they have nailed it)..

Any commit that should be applied to the RC should also be applied to
master/trunk, right? So - Why not commit it to master/trunk and nominate it
for inclusion in the release. This allows a release manager to look at the
bug, the fix, and the implications of of the fix before the fix lands in
the RC.

Once a commit has been made to master/trunk.. That fix can be cherry-picked
into the RC if it's deemed suitable.

Thanks,
Kiall

--bcaec519650945057c04bd45c3d6--