Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59228
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.213.42 as permitted sender)
MIME-Version: 1.0
Sender: yohgaki@gmail.com
In-Reply-To: <CAEZPtU42ULQpbFALfBHk1wR2R5+eJXCSMd_Z2T-8Arx64vxyDg@mail.gmail.com>
References: <CAGa2bXZP0GfH2_D8yOtj-LvbM2tQFQ49K4RwB8max9v4cCpTxg@mail.gmail.com>
 <op.wby3gkjqidpuyk@slws007.slhq.int> <CAGa2bXbMr4+xfwqK+D71MZHfQ1XPOdD9tRTCuRdOunwr1uT3MQ@mail.gmail.com>
 <CAEZPtU42ULQpbFALfBHk1wR2R5+eJXCSMd_Z2T-8Arx64vxyDg@mail.gmail.com>
Date: Fri, 30 Mar 2012 18:43:38 +0900
Message-ID: <CAGa2bXag=rzzXuXj+6+bg6YWxB_es64ef4WiSUH+BzRn2mZMtQ@mail.gmail.com>
To: Pierre Joye <pierre.php@gmail.com>
Cc: internals@lists.php.net, Stas Malyshev <smalyshev@sugarcrm.com>, ohannes@php.net
Content-Type: text/plain; charset=ISO-8859-1
Subject: Re: [PHP-DEV] Merge from 5.3 and/or 5.4. What's the current policy?
From: yohgaki@ohgaki.net (Yasuo Ohgaki)

Hi

2012/3/30 Pierre Joye <pierre.php@gmail.com>:
> hi,
>
> On Fri, Mar 30, 2012 at 10:22 AM, Yasuo Ohgaki <yohgaki@ohgaki.net> wrote:
>
>> Bug fix can be merged upwards. However,
>> Are we free to merge feature changes?
>
>
> Generally speaking, no.

I thought so.

>
>> Adding new module constant is new feature.
>
> Not necessary, for example in Curl or openssl, many constants addition
> do not change the implementation per se. But it has to be discussed
> from a case by case basis.
>
>> Before git, we just commit new feature/changes
>> to trunk and we could think/argue about merge
>> later. Now we need to think/argue about merge,
>> then commit.
>
> Right, and that's actually very good. The commit first then try to
> discuss is finally over.

For large changes, discussing first is good.
For small changes like this, it may be too much.

>
>> We need some guidelines for feature changes,
>> if we are going to keep "merge upward" policy.
>
>> Anyway, RM of 5.3/5.4 are okay to add module
>> constants to pgsql? If there is no objection, I'll
>> commit the change and updates docs.
>
> RMs apply the developers decisions, in general. So please post your
> proposals to the list, CCing them :)


https://gist.github.com/2250214

The change is simple one.
Just making constants available defined in pg-config.h

The only reason why I've made this thread for this simple
change is "merge upward" policy.

Someone suggested gitflow, the flow would be better for
faster development.

--
Yasuo Ohgaki
yohgaki@ohgaki.net