Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:77678 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 6484 invoked from network); 26 Sep 2014 15:20:46 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 26 Sep 2014 15:20:46 -0000 Authentication-Results: pb1.pair.com header.from=derick@php.net; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=derick@php.net; spf=unknown; sender-id=unknown Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 82.113.146.227 as permitted sender) X-PHP-List-Original-Sender: derick@php.net X-Host-Fingerprint: 82.113.146.227 xdebug.org Linux 2.6 Received: from [82.113.146.227] ([82.113.146.227:51914] helo=xdebug.org) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 4B/70-02658-C4485245 for ; Fri, 26 Sep 2014 11:20:44 -0400 Received: from localhost (localhost [IPv6:::1]) by xdebug.org (Postfix) with ESMTPS id 119D211A622; Fri, 26 Sep 2014 16:20:36 +0100 (BST) Date: Fri, 26 Sep 2014 16:20:35 +0100 (BST) X-X-Sender: derick@whisky.home.derickrethans.nl To: Ferenc Kovacs cc: Florian Margaine , PHP Internals In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: Re: [PHP-DEV] Should we dev on master then backport, or the other way? From: derick@php.net (Derick Rethans) On Fri, 26 Sep 2014, Ferenc Kovacs wrote: > On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine > 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