Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:77680
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain devilix.net designates 209.85.218.47 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.11.1409261620080.3594@whisky.home.derickrethans.nl>
References: <CABRjmp-O+sig=uqVpszNET65jEtCdSqeKyQtRmA=z5XL5R-Cdg@mail.gmail.com>
	<CAH-PCH4-ePty=vE_ooKYAvE9+ofWO42Q28mrdGW3sbWdQs+MeA@mail.gmail.com>
	<alpine.DEB.2.11.1409261620080.3594@whisky.home.derickrethans.nl>
Date: Fri, 26 Sep 2014 18:36:35 +0300
Message-ID: <CAPhkiZz11GEMDHuHZ3dxC2rfATUcH37jvguPu_3jFaZAJPDE1A@mail.gmail.com>
To: Derick Rethans <derick@php.net>
Cc: Ferenc Kovacs <tyra3l@gmail.com>, Florian Margaine <florian@margaine.com>, 
	PHP Internals <internals@lists.php.net>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [PHP-DEV] Should we dev on master then backport, or the other way?
From: narf@devilix.net (Andrey Andreev)

On Fri, Sep 26, 2014 at 6:20 PM, Derick Rethans <derick@php.net> wrote:
> On Fri, 26 Sep 2014, Ferenc Kovacs wrote:
>
>> On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine <florian@margaine.com>
>> wrote:
>>
>> > 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 (first PHP-5.6, then master).
>> >
>> > Is there a convention for php-src? Or is it "whatever the dev
>> > wants"?
>>
>> 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.
>
> But we really should fix this, as merging up is no fun right now.
>
> cheers,
> Derick

Hi,

IMO, there's no point in trying to merge between two fairly different
codebases. You could cherry-pick where appropriate, but this too will
become harder while PHP7 development progresses. In a natural way, the
two version trees become two separate efforts.

My $0.02.

Cheers,
Andrey.