Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59226 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 53838 invoked from network); 30 Mar 2012 08:45:07 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 30 Mar 2012 08:45:07 -0000 Authentication-Results: pb1.pair.com header.from=pierre.php@gmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=pierre.php@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.161.170 as permitted sender) X-PHP-List-Original-Sender: pierre.php@gmail.com X-Host-Fingerprint: 209.85.161.170 mail-gx0-f170.google.com Received: from [209.85.161.170] ([209.85.161.170:38350] helo=mail-gx0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id CE/00-53104-292757F4 for ; Fri, 30 Mar 2012 03:45:06 -0500 Received: by ggmb2 with SMTP id b2so170622ggm.29 for ; Fri, 30 Mar 2012 01:45:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Ia1RKdNUFXuZnFl9oEOC613oJQ6YZY3+FUlX/PY46KY=; b=rr4BxjgmkLvmMTYxuQSWr1skApotpVk0CgC/HDiIZtB4zYuM2Gztprwp0dI7e0jY36 4IPiTC5BQxgHb2dFZ6EEYFTRhhCZacY1oYDO7TD/rJsUlVe1cwTriIvhirla+uybKsjs BA+JoMI6xl+iL5KawYd/kEbLdV7ieRHP6sEgeOEOxZcL7wfHadQZiXjRRlLNf+wF9DEl 7rly/y/Kw+4qyWimy3jpXznHyua47TJdlmqiXGhBI4wEgQiT1dC0RNllD5x2r8cffvUC 2s0ektsXeDVm1MmC3hB9j+eN+VCLLMF96Pe8mob9kWTG9J6ldBt/uEYU4hF+cTFojCci aCOw== MIME-Version: 1.0 Received: by 10.236.114.168 with SMTP id c28mr1137306yhh.58.1333097101129; Fri, 30 Mar 2012 01:45:01 -0700 (PDT) Received: by 10.147.168.16 with HTTP; Fri, 30 Mar 2012 01:45:01 -0700 (PDT) In-Reply-To: References: Date: Fri, 30 Mar 2012 10:45:01 +0200 Message-ID: To: Yasuo Ohgaki Cc: Gustavo Lopes , internals@lists.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: pierre.php@gmail.com (Pierre Joye) hi, On Fri, Mar 30, 2012 at 10:22 AM, Yasuo Ohgaki wrote: > Bug fix can be merged upwards. However, > Are we free to merge feature changes? Generally speaking, no. > 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. > 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 :) Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org