On Fri, Jul 25, 2014 at 4:35 PM, Rogerio Prado de Jesus < rogeriopra...@gmail.com> wrote:
> Hi, Ferenc, > > The event ran good (feedbacks in https://joind.in/event/view/2258) and > probably we will do periodic test fest here in São Paulo, Brazil > (https://github.com/PHPSP/hexagon-project/issues/14). > > Anyway, now you are closing the event by send the Pull Requests to > https://github.com/php/php-src. > > I've a question, please help us: > > > We have some test contributions that targets not only PHP-5.6, but > PHP-5.5 and master as well. > > For every pull request to PHPSP fork, we are going to create three > branches in (eg. phpsp-pr000-php-5.5, phpsp-pr000-php-5.6 and > phpsp-pr000-master), and eventually send three pull requests to core > from PHPSP fork. > > # Example: > > ## Contributed tests: > > https://github.com/PHPSP/php-src/pull/2. > > ## Branches created in PHPSP fork: > > - https://github.com/PHPSP/php-src/tree/phpsp-pr002-php-5.6 > - https://github.com/PHPSP/php-src/tree/phpsp-pr002-PHP-5.5 > - https://github.com/PHPSP/php-src/tree/phpsp-pr002-master > > ## Pull requests from PHPSP fork to php/php-src core: > > - https://github.com/php/php-src/pull/742 (5.5) > - https://github.com/php/php-src/pull/743 (5.6) > - https://github.com/php/php-src/pull/744 (master) > > Is that correct? Can I continue with the other contributions we have? > Or you guys suggest a better path? > > Thanks in advance! > > Rogerio > rogeriopra...@php.net > rogeriopra...@gmail.com > rogeriopradoj.com > > Hi Rogerio, we usually merge everything upwards, so if your test is basically the same across the branches, you should only create a pull request for the lowest branch applicable, and the one doing the merge will merge up to the higher branches anyways. how did the event go? to tell you the truth I've expected more questions/problems as our test framework is pretty "unique". :P -- Ferenc Kovács @Tyr43l - http://tyrael.hu
