Re: HEADS UP: Force pushed to revert to d55afe4df63945a6e3abe9892ba7836f83c74265
| From: | Johannes Schlüter | Date: | Wed, 18 Apr 2012 10:41:30 +0000 |
| Subject: | Re: HEADS UP: Force pushed to revert to d55afe4df63945a6e3abe9892ba7836f83c74265 | ||
| References: | 1 | Groups: | php.cvs php.internals |
| Request: | Send a blank email to internals+get-60180@lists.php.net to get a copy of this message | ||
On Wed, 2012-04-18 at 12:35 +0200, Johannes Schlüter wrote:
> Hi,
>
> the master branch was accidentally merged into the 5.4 branch. I
> reverted that by force pushing the old revision
> d55afe4df63945a6e3abe9892ba7836f83c74265 into PHP-5.4 and then
> cherry-picking all revisions since then. Please take a look and
> double-check that nothing was lost.
I've pushed the "messed" branch to
https://github.com/johannes/php-src/tree/php-5.4-messup
in case somebody
wants to verify something.
johannes