Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59213 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 587 invoked from network); 30 Mar 2012 01:00:13 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 30 Mar 2012 01:00:13 -0000 Authentication-Results: pb1.pair.com smtp.mail=yohgaki@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=yohgaki@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.213.170 as permitted sender) X-PHP-List-Original-Sender: yohgaki@gmail.com X-Host-Fingerprint: 209.85.213.170 mail-yx0-f170.google.com Received: from [209.85.213.170] ([209.85.213.170:38338] helo=mail-yx0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 6A/50-32875-C95057F4 for ; Thu, 29 Mar 2012 20:00:12 -0500 Received: by yenl5 with SMTP id l5so63853yen.29 for ; Thu, 29 Mar 2012 18:00:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:x-google-sender-auth:message-id :subject:to:content-type; bh=875vvjblwShRmyBi0MduF3XaNnjyo5y6jEuZI+XwS/w=; b=mN8GnsTWdEgmbD9Wj6eu/9m0we6vxX6v486BN0p+zPbZy59PGPDC/kklda0RAJE6ob JbqayAtvaOcMcnf6ufXlTc4aV3Iw2UsjmboKpYYOZlxm1MISD9BvQ+1O7ILq+G297FAZ q+qWhDwRGgyEToRrHTkvs7CWQynhLOZPKfT6C5Zo/p5yzu2RhHx8R2vh2XYjQJvAiHYM m0noyvBUPLYUgQXVqfqf2kMIcwP3k/e19IUqxSjk4MzIQlzKL+KDZFFnwfJ7AuAsMop7 DUf/Ar2LQwZpoJoH9rCCYI3DxqflU0eBH49XfHWsxayLAmn9c2fPpbqe6XZm7LUxLlUp qR1w== Received: by 10.236.183.228 with SMTP id q64mr169593yhm.120.1333069210001; Thu, 29 Mar 2012 18:00:10 -0700 (PDT) MIME-Version: 1.0 Sender: yohgaki@gmail.com Received: by 10.146.86.14 with HTTP; Thu, 29 Mar 2012 17:59:29 -0700 (PDT) Date: Fri, 30 Mar 2012 09:59:29 +0900 X-Google-Sender-Auth: feRi4dA7S9o4k9V9QfseJitoAh8 Message-ID: To: internals@lists.php.net Content-Type: text/plain; charset=ISO-8859-1 Subject: Merge from 5.3 and/or 5.4. What's the current policy? From: yohgaki@ohgaki.net (Yasuo Ohgaki) Hi, 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?" Regards, -- Yasuo Ohgaki yohgaki@ohgaki.net