Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:63743
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.210.170 as permitted sender)
MIME-Version: 1.0
Sender: julienpauli@gmail.com
In-Reply-To: <CAJW__o24eOxw7+7pBubdysejptr4c8vQyx=OZvqc6BEfAEiwrg@mail.gmail.com>
References: <508F971F.2000009@php.net> <CAJW__o24eOxw7+7pBubdysejptr4c8vQyx=OZvqc6BEfAEiwrg@mail.gmail.com>
Date: Mon, 5 Nov 2012 14:37:07 +0100
Message-ID: <CAMUwpuSTpox9KDTgM-G0LUWoPcM_xcLPS7AxZM8rExHPza402A@mail.gmail.com>
To: Kalle Sommer Nielsen <kalle@php.net>
Cc: "dsp@php.net" <dsp@php.net>, "internals@lists.php.net" <internals@lists.php.net>
Content-Type: text/plain; charset=ISO-8859-1
Subject: Re: [PHP-DEV] Branching PHP-5.5
From: jpauli@php.net (jpauli)

On Fri, Nov 2, 2012 at 1:49 PM, Kalle Sommer Nielsen <kalle@php.net> wrote:
> Hi David
>
> 2012/10/30 dsp@php.net <dsp@php.net>
>
>> Hi Internals,
>>
>> it's been a while since we started talking about PHP 5.5 and we are
>> already a little bit late with my release plans. I've started reviewing
>> the current master and came to the conclusion that it does make more
>> sense to me to branch 5.5 of master for a few reasons:
>>
>
> It's been a while since I contributed anything to the core, however I
> remember what a mess it was to cross merge back in the CVS days and I
> honestly do not see a big reason to make a "bigger" mess by branching yet
> another version, I think we can easily cope with having 5.5 as the current
> master branch like we did with the original 6.0 so until 5.4 is gonna
> "retire" or go into security fixes only mode like 5.3 currently is, then I
> think it makes a little sense to do so.
>
> Now I realize that we are trying to speed up releases and I probably
> skipped a few discussions which will render my mail here void, but until
> 5.4 is in "security-fixes-only" mode then I think 5.5 should remain as the
> current master.


Hey :-)

AFAIK, we cant afford BC Breaks in 5.5
Kalle, do you mean you'd like to commit to master and, when release
time comes, create a branch from master and name it 5.5 ? (tagging it
for releases) ?
We have to be really carefull about breaks, I think we should leave
master as the master branch and rebase commits from it to 5.5 branch
choosing what we want to merge or not.
What are git skilled people thinking ?

Julien.P