Use
git reset --hard origin/PHP-5.4
to reset your local checkout to the current version on the server.
It should be noted that when you `reset --hard`, you'll lose local changes
(including branch commits, except in the reflog). You'll probably want to stash
first, reset, then stash pop
What are the options for reverting this fix (while keeping security)?
Thanks for the help on this, Anatoliy and Chris.
In my opinion, it is too late to revert the new behaviour.
I currently have this in my codebase:
if (version_compare(PHP_VERSION, '5.3.11') = 0) {
seanSat Apr 4 16:58:39 2009 UTC
Modified files:
/php-src/ext/imap config.m4
Log:
improve error message when missing c-client (just bit me on Ubuntu 8.10)
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.78r2=1.79diff_format=u
Index:
seanMon Nov 10 19:01:35 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/tests/classes arrayobject_001.phpt
Log:
add test for ArrayObject acting as array (for 5.3)
seanMon Nov 10 19:22:11 2008 UTC
Modified files:
/php-src/tests/classes arrayobject_001.phpt
Log:
(MFB because I'm a bad person) test to ensure that ArrayObject can act as an
array
