Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59222
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain nebm.ist.utl.pt from 193.136.128.21 cause and error)
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
To: internals@lists.php.net, "Yasuo Ohgaki" <yohgaki@ohgaki.net>
References: <CAGa2bXZP0GfH2_D8yOtj-LvbM2tQFQ49K4RwB8max9v4cCpTxg@mail.gmail.com>
Date: Fri, 30 Mar 2012 09:37:22 +0200
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Organization: =?utf-8?Q?N=C3=BAcleo_de_Eng=2E_Biom=C3=A9di?=
 =?utf-8?Q?ca_do_I=2ES=2ET=2E?=
Message-ID: <op.wby3gkjqidpuyk@slws007.slhq.int>
In-Reply-To: <CAGa2bXZP0GfH2_D8yOtj-LvbM2tQFQ49K4RwB8max9v4cCpTxg@mail.gmail.com>
User-Agent: Opera Mail/11.61 (Win32)
Subject: Re: [PHP-DEV] Merge from 5.3 and/or 5.4. What's the current policy?
From: glopes@nebm.ist.utl.pt ("Gustavo Lopes")

On Fri, 30 Mar 2012 02:59:29 +0200, Yasuo Ohgaki <yohgaki@ohgaki.net>  
wrote:

> Since the git work flow in the wiki requires to apply patch to
> lowest possible  branch, then merge upwards.
>
> This changes old work flow, commit trunk, then merge to
> release.
>
> I've committed simple build problem fix to all branches, I think
> release masters don't care such merge. However, how about
> feature changes?
>
> I have simple patch for
>
> Request #47570	libpq's PG_VERSION should be exported to userland
> https://bugs.php.net/bug.php?id=47570
>
> This is simple change, but it's new feature. (I added 2 new module
> constants for PG_VERSION, PG_VERSION_STR)
>
> Question is "What's the standard work flow for new features?"
>

I don't see how this is any different. "Lowest possible branch" doesn't  
necessarily mean 5.3. It can mean 5.4 or master.

If the feature is not appropriate for 5.3, but it is for 5.4 and master,  
commit it to 5.4 and merge 5.4 into master. Or it can be appropriate just  
for master, in which case there's no merge into other branches. This is  
the most common scenario -- when a commit is applicable to one branch and  
all other more recent ones.

The problem with the current workflow is only when you have something  
specific to a lower branch, which is not applicable to upper branches  
because the code base has diverged. You still have to merge upwards in  
those situations and resolve the likely conflict (typically with the  
"ours" strategy).

-- 
Gustavo Lopes