Hey All (particularly Julien & Ferenc),
While working on an issue caused by re2c+ext/date on OS X that was holding
up 7.1.0beta1 and causing the latest 7.0 bulld to need to be re-tagged:
I accidentally messed up due to lack of sleep and merged master into
PHP-5.6. Because I cannot force push to the PHP-5.6 branch I cannot revert
the change back to the last good commit:
9ebc96116b609cd3c969c2d5a460aaa904c2afec
I'm waiting on someone with the ability to force push (me, nor Anatol, not
Derick, have permission) to fix it.
In the meantime: THE BRANCH IS BROKEN, DO NOT COMMIT TO IT AS YOU MAY LOSE
YOUR WORK.
If you do want to work in 5.6, you should be fine to do the following
locally:
git reset --hard 9ebc96116b609cd3c969c2d5a460aaa904c2afec
and build commits on top of that. Just wait for the all-clear before
pushing (you won't be able to push actually).
I apologize for this, especially to the RMs during the build/tag days.
Sorry all,
- Davey
P.S.
if you can force push, the following will fix it:
git fetch --all
git checkout PHP-5.6
git reset --hard 9ebc96116b609cd3c969c2d5a460aaa904c2afec
git push origin -f PHP-5.6
or alternatively the following should also work:
git push origin -f 9ebc96116b609cd3c969c2d5a460aaa904c2afec:PHP-5.6
Hey All (particularly Julien & Ferenc),
While working on an issue caused by re2c+ext/date on OS X that was holding
up 7.1.0beta1 and causing the latest 7.0 bulld to need to be re-tagged:I accidentally messed up due to lack of sleep and merged master into
PHP-5.6. Because I cannot force push to the PHP-5.6 branch I cannot revert
the change back to the last good commit:
This also ended up closing some issues, that shouldn't have been:
http://news.php.net/php.bugs/202441
http://news.php.net/php.bugs/202442
http://news.php.net/php.bugs/202443
http://news.php.net/php.bugs/202444
cheers,
Derick