Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:77666
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.215.41 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CABRjmp-O+sig=uqVpszNET65jEtCdSqeKyQtRmA=z5XL5R-Cdg@mail.gmail.com>
References: <CABRjmp-O+sig=uqVpszNET65jEtCdSqeKyQtRmA=z5XL5R-Cdg@mail.gmail.com>
Date: Fri, 26 Sep 2014 13:43:40 +0200
Message-ID: <CAH-PCH4-ePty=vE_ooKYAvE9+ofWO42Q28mrdGW3sbWdQs+MeA@mail.gmail.com>
To: Florian Margaine <florian@margaine.com>
Cc: PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=001a11c36724b1d6f60503f66d18
Subject: Re: [PHP-DEV] Should we dev on master then backport, or the other way?
From: tyra3l@gmail.com (Ferenc Kovacs)

--001a11c36724b1d6f60503f66d18
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine <florian@margaine.com>
wrote:

> Hi internals,
>
> The question is in the title :-)
>
> As far as I know, most projects follow this convention: develop on the
> master branch, then backport the fixes/features to older versions.
>
> I had a discussion with another core dev who told me he did the opposite:
> develop on PHP-5.5, then move the fix/feature up to the new branches (fir=
st
> PHP-5.6, then master).
>
> Is there a convention for php-src? Or is it "whatever the dev wants"?
>
> --
>
> Regards,
>
> *Florian Margaine*
>

see https://wiki.php.net/vcs/gitworkflow
if a change affects multiple branch we commit it to the lowest possible
branch and merge it upwards.
there were a recent discussion about whether or not to change this, as the
current master (aka PHP7) has major changes which makes the merge
everything up strategy a lot more painful, but this discussion didn't
reached a consensus so there are no change in the old workflow.

--=20
Ferenc Kov=C3=A1cs
@Tyr43l - http://tyrael.hu

--001a11c36724b1d6f60503f66d18--