Welcome! Log In Create A New Profile

Advanced

[PHP-DEV] Re: com php-src: Fixed reference counting: ext/spl/spl_directory.c

Posted by David Soria Parra 
On 2012-03-22, Dmitry Stogov <[email protected]> wrote:
> Commit: 14af1fe6923c65a91cd77eab5a8d4326f854391d
> Author: Dmitry Stogov <[email protected]> Thu, 22 Mar 2012 14:38:38 +0400
> Parents: 523396cb28a0cb87ced9ec1179ef4f119d28ec80
> Branches: PHP-5.3 PHP-5.4
>

why are you commiting the patch 3 times? we have a defined workflow
how to patch in git.

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
On 2012-03-22, David Soria Parra <[email protected]> wrote:
> On 2012-03-22, Dmitry Stogov <[email protected]> wrote:
>> Commit: 14af1fe6923c65a91cd77eab5a8d4326f854391d
>> Author: Dmitry Stogov <[email protected]> Thu, 22 Mar 2012 14:38:38 +0400
>> Parents: 523396cb28a0cb87ced9ec1179ef4f119d28ec80
>> Branches: PHP-5.3 PHP-5.4
>>
>
> why are you commiting the patch 3 times? we have a defined workflow
> how to patch in git.

FYI: I reverted the changes on PHP-5.4 and master branch and merged
the fix from the PHP-5.3 branch into PHP-5.4 and master. This
way we can only refer to this particular change as revision 14af1fe6

This will help us to follow the described workflow at

http://wiki.php.net/vcs/gitworkflow


--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
Sorry, only registered users may post in this forum.

Click here to login