Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:58724
Return-Path: <dsp@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 57071 invoked from network); 7 Mar 2012 09:12:19 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 7 Mar 2012 09:12:19 -0000
X-Host-Fingerprint: 217.114.211.68 unknown  
Date: Wed, 07 Mar 2012 04:12:18 -0500
Received: from [217.114.211.68] ([217.114.211.68:5611] helo=localhost.localdomain)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id FA/83-38795-276275F4 for <internals@lists.php.net>; Wed, 07 Mar 2012 04:12:18 -0500
To: internals@lists.php.net
References: <slrnjl54vo.mfm.dsp@experimentalworks.net>
 <4F5336B2.3040200@kukulich.cz> <4F53DF00.6070303@gmx.net>
 <CANAnSg3COrBz2-USuJrn5pDguR4FGumPqktzsz-gkJSB5yUG+g@mail.gmail.com>
 <CAGSj+QvAeSSTXZZdVCzBgurNX-eVBu6p8on-YR4hzpDE3ubO5A@mail.gmail.com>
 <CAKOpQSzzONLbK9UALoAjx4S47zcjg=H8+R6H4sncWv_yLnPXEg@mail.gmail.com>
User-Agent: slrn/0.9.9p1 (SunOS)
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <slrnjle9jf.mfm.dsp@experimentalworks.net>
X-Posted-By: 217.114.211.68
Subject: Re: [PHP-DEV] Re: Git Migration: Status Update
From: dsp@php.net (David Soria Parra)

On 2012-03-07, Kris Craig <kris.craig@gmail.com> wrote:
> --f46d044304ec4e135704baa12342
> Content-Type: text/plain; charset=ISO-8859-1
>
> On Tue, Mar 6, 2012 at 10:09 PM, Kiall Mac Innes <kiall@managedit.ie> wrote:
>
>> On Wed, Mar 7, 2012 at 6:03 AM, Drak <drak@zikula.org> wrote:
>>
> I know I keep promising to draft an RFC for this lol, so I'll make it a
> high priority to put together an RFC for a PHP Git branching model sometime
> this week[end].

There is no need for that. PHP will continue to use release branches
with optional feature branches. We are doing one step at a time and
have people adopt the changes slowly. We are after all a large project
and a lot of contributors cannot spend hours of reading into a VCS
and a new branching model. So we are slowly moving towards new models.

After all I see no need to do it differently. You can use whatever
branching model you want in your personal github repository and then
send a final pull request that can be merged. Adding complexity
to the main repository for no reason is not needed. Keep the
complexity in your personal repositories. That is after all
one of the main benefits of a decentralized version control system.