Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:77667 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 83608 invoked from network); 26 Sep 2014 11:48:28 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 26 Sep 2014 11:48:28 -0000 Authentication-Results: pb1.pair.com smtp.mail=florian@margaine.com; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=florian@margaine.com; sender-id=unknown Received-SPF: error (pb1.pair.com: domain margaine.com from 209.85.223.172 cause and error) X-PHP-List-Original-Sender: florian@margaine.com X-Host-Fingerprint: 209.85.223.172 mail-ie0-f172.google.com Received: from [209.85.223.172] ([209.85.223.172:42781] helo=mail-ie0-f172.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 39/FA-27411-B8255245 for ; Fri, 26 Sep 2014 07:48:27 -0400 Received: by mail-ie0-f172.google.com with SMTP id rp18so13468586iec.17 for ; Fri, 26 Sep 2014 04:48:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=yUwRgRIvLt18rH+uUr2490VOF7+B46u6ZJQt1pSn1E0=; b=M/7bOUZZD+faTx/wuEBp5aIButg+FILFInl5LUIk7NSuyggRTiZDBakyBtHT2zlvAw G4ND2AW4+sadsAN/P6ZmwgbOJpxJU9dDyqXvgRCeAT0SM8EXiQLFfxDRbiaDv5WF1tXF p0fZYWwbOoRY4VsbqbAfbsXkV7hFbm/D/0Kprz+Dlz4a+fYFuLM5OO4dWfy+lA4PzmgX xOBTFZCji3R6/AikhWh4yzDTluARXrU3YIbRdF/6iuiJkNjKB29gBwnVP3/z97/Ax93K bwujtur1kUcnVVb8ba8KbclHlK97zIDC2yRfJjE/lHFGTocRCiq/s1QAh7IeOXyJz7/4 RW0Q== X-Gm-Message-State: ALoCoQkmMF9jWbNiAJlLoFQNNxMYHIgIYJaj93SkKxBxLGlazNqFg1rnntMnDpQCCHJC09rDXUa5 X-Received: by 10.50.60.65 with SMTP id f1mr29291392igr.38.1411732104811; Fri, 26 Sep 2014 04:48:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.5.194 with HTTP; Fri, 26 Sep 2014 04:48:04 -0700 (PDT) X-Originating-IP: [93.8.60.50] In-Reply-To: References: Date: Fri, 26 Sep 2014 13:48:04 +0200 Message-ID: To: Ferenc Kovacs Cc: PHP Internals Content-Type: multipart/alternative; boundary=047d7b10cf9da024d50503f67ecf Subject: Re: [PHP-DEV] Should we dev on master then backport, or the other way? From: florian@margaine.com (Florian Margaine) --047d7b10cf9da024d50503f67ecf Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I see, thanks for the answer! On Fri, Sep 26, 2014 at 1:43 PM, Ferenc Kovacs wrote: > > > On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine > wrote: > >> Hi internals, >> >> 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"? >> >> -- >> >> Regards, >> >> *Florian Margaine* >> > > 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 th= e > 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. > > -- > Ferenc Kov=C3=A1cs > @Tyr43l - http://tyrael.hu > --=20 Regards, *Florian Margaine* --047d7b10cf9da024d50503f67ecf--