Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:77665 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 80220 invoked from network); 26 Sep 2014 11:42:56 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 26 Sep 2014 11:42:56 -0000 Authentication-Results: pb1.pair.com header.from=remi@fedoraproject.org; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=remi@fedoraproject.org; spf=permerror; sender-id=unknown Received-SPF: error (pb1.pair.com: domain fedoraproject.org from 217.70.183.195 cause and error) X-PHP-List-Original-Sender: remi@fedoraproject.org X-Host-Fingerprint: 217.70.183.195 relay3-d.mail.gandi.net Received: from [217.70.183.195] ([217.70.183.195:41385] helo=relay3-d.mail.gandi.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id B4/3A-27411-E3155245 for ; Fri, 26 Sep 2014 07:42:55 -0400 Received: from mfilter5-d.gandi.net (mfilter5-d.gandi.net [217.70.178.132]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 64FAEA80D8 for ; Fri, 26 Sep 2014 13:42:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter5-d.gandi.net Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by mfilter5-d.gandi.net (mfilter5-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id GO+RS70Nj9rJ for ; Fri, 26 Sep 2014 13:42:20 +0200 (CEST) X-Originating-IP: 82.241.130.121 Received: from schrodingerscat.famillecollet.com (pom51-2-82-241-130-121.fbx.proxad.net [82.241.130.121]) (Authenticated sender: contact@ll-experts.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id DE7E3A80CB for ; Fri, 26 Sep 2014 13:42:20 +0200 (CEST) Message-ID: <5425511C.7000702@fedoraproject.org> Date: Fri, 26 Sep 2014 13:42:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.1.1 MIME-Version: 1.0 To: internals@lists.php.net References: In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [PHP-DEV] Should we dev on master then backport, or the other way? From: remi@fedoraproject.org (Remi Collet) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Le 26/09/2014 13:29, Florian Margaine a =C3=A9crit : > Hi internals, >=20 > The question is in the title :-) >=20 > As far as I know, most projects follow this convention: develop on > the master branch, then backport the fixes/features to older > versions. >=20 > 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). Yes this way. >=20 > Is there a convention for php-src? Or is it "whatever the dev > wants"? >=20 See https://wiki.php.net/vcs/gitworkflow Remi -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlQlURwACgkQYUppBSnxahh+aQCffuNOmQJeSSAVjn9lCIx1YMl0 qk0AoOkHVzo7r85HxpxSDn1z98Y4ZVEc =3DGRTv -----END PGP SIGNATURE-----