Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:73515
Return-Path: <johannes@schlueters.de>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 40479 invoked from network); 2 Apr 2014 12:36:06 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 2 Apr 2014 12:36:06 -0000
Authentication-Results: pb1.pair.com header.from=johannes@schlueters.de; sender-id=unknown
Authentication-Results: pb1.pair.com smtp.mail=johannes@schlueters.de; spf=permerror; sender-id=unknown
Received-SPF: error (pb1.pair.com: domain schlueters.de from 217.114.215.10 cause and error)
X-PHP-List-Original-Sender: johannes@schlueters.de
X-Host-Fingerprint: 217.114.215.10 mail.experimentalworks.net  
Received: from [217.114.215.10] ([217.114.215.10:34471] helo=mail.experimentalworks.net)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 4B/01-34012-5340C335 for <internals@lists.php.net>; Wed, 02 Apr 2014 07:36:06 -0500
Received: from [192.168.2.31] (ppp-188-174-32-124.dynamic.mnet-online.de [188.174.32.124])
	(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: johannes@schlueters.de)
	by mail.experimentalworks.net (Postfix) with ESMTPSA id 4E7CB46424;
	Wed,  2 Apr 2014 14:36:52 +0200 (CEST)
To: Julien Pauli <jpauli@php.net>
Cc: Ferenc Kovacs <tyrael@php.net>, David Soria Parra <dsp@php.net>, 
 Stanislav Malyshev <stas@php.net>, PHP internals list
 <internals@lists.php.net>
In-Reply-To: <1396441439.2982.284.camel@guybrush>
References: <1396441439.2982.284.camel@guybrush>
Content-Type: text/plain; charset="UTF-8"
Date: Wed, 02 Apr 2014 14:35:33 +0200
Message-ID: <1396442133.2982.286.camel@guybrush>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Content-Transfer-Encoding: 8bit
Subject: Re: [PHP-DEV] Merging release branches back to parent
From: johannes@schlueters.de (Johannes =?ISO-8859-1?Q?Schl=FCter?=)

On Wed, 2014-04-02 at 14:23 +0200, Johannes Schlüter wrote:
> Hi RMs,
> 
> we currently use release branches which we don't merge back into the
> original branch.I would like to propose to change this and merge the
> release branch back into it's parent branch. To the est of my
> remembrance not doing this is a reminder of SVN merge tracking annoyance
> which is not relevant anymore.
> 
> The reason for this change is that it makes it hard to find out whether
> a patch was part of a release or not and which release it appeared in
> first.
> 
> The suggested work flow (pushes ignored) is like this:
> 
>      1. git checkout PHP-X.Y
>      2. git branch PHP-X.Y.Z
>      3. vim NEWS configure.in main/php_version.h && git commit (set to
>         next version X.Y.Z+1)
>      4. git checkout PHP-X.Y.Z
>      5. test, cherry pick and release RCs as needed
>      6. vim NEWS configure.in main/php_version.h && git commit (for
>         release)
>      7. git tag -s php-X.Y.Z
>      8. git checkout PHP X.Y
>      9. git merge PHP-X.Y.Z
>     10. resolve merge conflict in NEWS and other files && git commit

This was missing a step already done with current procedure:

    11. Merge up till reaching master

as we do for all other commits, obviously.

johannes