Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:76927
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.51 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAMUwpuQ6xm=tyP-QNfDd0dswLqvPoCOV+x94ZPD7z=O-1B3ObQ@mail.gmail.com>
References: <CAMUwpuQ6xm=tyP-QNfDd0dswLqvPoCOV+x94ZPD7z=O-1B3ObQ@mail.gmail.com>
Date: Thu, 28 Aug 2014 22:04:35 +0200
Message-ID: <CAH-PCH6dzPgXN+HX14=nDAxfDjXf6dXw-3RnJ1mpn1igEAiwPA@mail.gmail.com>
To: Julien Pauli <jpauli@php.net>
Cc: PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=001a11c12ce6add3b50501b60b65
Subject: Re: [PHP-DEV] Cleaning 5.3 git branches ?
From: tyra3l@gmail.com (Ferenc Kovacs)

--001a11c12ce6add3b50501b60b65
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Thu, Aug 28, 2014 at 8:55 PM, Julien Pauli <jpauli@php.net> wrote:

> Hello,
>
> We all know 5.3 is now EOL.
>
> Looking at git branches, 5.0, 5.1 and 5.2 still have their respective
> main branches (which is all right and good).
>
> However, they dont have their release branch references (5.1.1 , 5.1.2
> etc...) , however they still show their own release tags, which is
> also all right.
>
> As a reminder, release *branches* (not the tags) are used by the RMs
> to actually release the version.
> RMs branch from the main repo into a release branch, and apply their
> RM-managing-stuff commits as well as backport eventual commits from
> the main branch, for CVEs, for example.
>
> Those release branches are here just for the release, and are no
> longer needed at all after the release has been released, because
> every release owns its own final git tag.
>
> The tag is written lowercased (php-5.5.4) and the branch is written
> uppercased (PHP-5.5.4).
>
>
> What I suggest, is removing those branch references from our git, for
> EOL versions of PHP.
> This is done for PHP<=3D5.2 (but that was before the move to git) , but
> PHP5.3 release branches are still referenced.
>
> Of course references in git are very light things, but they tend to
> pollute the references.
> For example , browsing our branches in the github mirror select box is
> a pain nowadays.
> Same for git command line autocompletion that shows every remote
> branches, or the "git branch --all" command , and its friends.
>
> I already sent a mail, few months ago, to clean the branches we dont
> use any more.
> Some argued that for history, they should be kept referenced.
>
> But, thoughts to clean *release branches* from our git for *EOL PHP
> versions*, like 5.3 ?
> Tag references should be enough for history, IMHO
>
> Julien.P
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
Hi,

just my two cents:
I think RMs should remove the PHP-X.Y.Z branches after a release is made
(as you mentioned we already have a tag, and after a release is made, we
will never continue development/re-tag, so there is no reason to preserve
the branch).
I also think that feature/work branches should be deleted after they are
merged (we still have phpng and str_size_and_int64 for example).
But I don't see much point in deleting the release branches (PHP-X.Y) even
for eol'ed version.
The number of those branches are pretty small, sometimes we leave some
commits in the release branch, which doesn't made into the last release tag
(https://github.com/php/php-src/compare/PHP-5.3.29...PHP-5.3), plus in the
past we had precedence(PHP-5.2), when we had to make additional releases
after the originally planned EOL release, which if using this policy would
be a bit messy(you either don't merge those commits upward, or you have to
recreate the previously deleted PHP-X.Y branch first, or create a PHP-X.Y.Z
branch from the last tag, push there, and merge and tag from that branch).

--=20
Ferenc Kov=C3=A1cs
@Tyr43l - http://tyrael.hu

--001a11c12ce6add3b50501b60b65--