Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:97059
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.220.175 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <1476497232.26396.4.camel@kuechenschabe>
References: <1476497232.26396.4.camel@kuechenschabe>
Date: Sat, 19 Nov 2016 18:35:01 +0100
Message-ID: <CAH-PCH7GqSTrYWknY+zu6HPtDY_tgp1Ys-ZskJcDWq2V+zZN2A@mail.gmail.com>
To: =?UTF-8?Q?Johannes_Schl=C3=BCter?= <johannes@php.net>
Cc: PHP internals list <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=94eb2c05709caa33d30541aad742
Subject: Re: [PHP-DEV] Limited access to php_version.h [Fwd: [PHP-CVS] svn:
 /SVNROOT/ global_avail]
From: tyra3l@gmail.com (Ferenc Kovacs)

--94eb2c05709caa33d30541aad742
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Sat, Oct 15, 2016 at 4:07 AM, Johannes Schl=C3=BCter <johannes@php.net> =
wrote:

> Hi,
>
> I've restricted access to main/php_version.h. This should restrict wrong
> merges by a bit. Hope this doesn't cause issues. Current RMs should have
> access. This is the current list:
>
> avail|rasmus,johannes,tyrael,ab,jpauli,davey,krakjoe,dsp|php
> -src.git/main/php_version.h
>
> johannes
>
>
> ---------- Forwarded message ----------
> From: "Johannes Schl=C3=BCter" <johannes@php.net>
> To: php-cvs@lists.php.net
> Cc:
> Date: Sat, 15 Oct 2016 02:02:15 +0000
> Subject: [PHP-CVS] svn: /SVNROOT/ global_avail
> johannes                                 Sat, 15 Oct 2016 02:02:15 +0000
>
> Revision: http://svn.php.net/viewvc?view=3Drevision&revision=3D340492
>
> Log:
> Limit access to php_vesion.h
>
> This serves as a small mitigation to prevent wrong merges (i.e. merging
> PHP-7.1 into PHP-7.0 instead of the other way round) This won't cover all
> cases, but hopefully reduces the number of issues.
>
> Changed paths:
>     U   SVNROOT/global_avail
>
> Modified: SVNROOT/global_avail
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- SVNROOT/global_avail        2016-10-14 22:23:44 UTC (rev 340491)
> +++ SVNROOT/global_avail        2016-10-15 02:02:15 UTC (rev 340492)
> @@ -28,6 +28,14 @@
>  # php-src karma and before lines granting Zend/TSRM karma)
>  unavail||php-src.git/Zend,php-src.git/TSRM
>
> +# Limit access to man/php_version.h as a mitigation for wrong merges
> (this line
> +# MUST come after lines granting hp-src karma and before lines granting
> +# man/php_version.h karma)
> +unavail||php-src.git/main/php_version.h
> +
> +# RMs and a few others have access to main/php_version.h (see unavail
> above)
> +avail|rasmus,johannes,tyrael,ab,jpauli,davey,krakjoe,dsp|ph
> p-src.git/main/php_version.h
> +
>  # PEAR bits in the main php-src module
>  avail|mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,
> cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,
> derick|php-src.git/pear
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>

hi,

the only case I can think of would be if we were using feature branches,
this change would prevent other people from merging from the dev branches
if the merge touches php_version.h
but I think it is clearly better to have an easy guard against bogus merges
which prevents a feature not even used atm.
and of course we can have a better fix in the future if we ever want to use
feature branches in the php-src repo.

--=20
Ferenc Kov=C3=A1cs
@Tyr43l - http://tyrael.hu

--94eb2c05709caa33d30541aad742--