On Thu, 19 Jul 2012, srgoogleguy wrote:

Fixes mcrypt_ecb not issuing an E_DEPRECATED level notice, despite having been deprecated for some time. Please reference bug #62374 as well.

You can merge this Pull Request by running:

git pull https://github.com/srgoogleguy/php-src mcrypt-ecb-fix

Or you can view, comment on it, or merge it online at:

#138

-- Commit Summary --

• Implement Request #47570 libpq's PG_VERSION should be exported to userland
• Add NEWS
• Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
• Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
• Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
• Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
• Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
• Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
• Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
• Merge branch 'PHP-5.4' of github.com:srgoogleguy/php-src into PHP-5.4
• Fixes mcrypt_ecb deprecated error not showing - reference bug #62374

This looks weird. The PR should only have the last commit in it.

cheers,
Derick

http://derickrethans.nl | http://xdebug.org
Like Xdebug? Consider a donation: http://xdebug.org/donate.php
twitter: @derickr and @xdebug

Yea, I have no idea why it keeps doing that. I'm trying to rebase. I think it's because I messed up my local branch and keeps adding old commits for some reason.

I'll try to get those strange commits removed later today when I get a chance.
Thanks.

Hi, @srgoogleguy
It seems you merge branches by your self and commit, if you want to update your local
branch you could pull from it but not merge, this link might be helpful :) https://wiki.php.net/vcs/gitworkflow

This has been fixed and sent as a new PR 139

thanks