Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:94585 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 50986 invoked from network); 20 Jul 2016 11:40:21 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 20 Jul 2016 11:40:21 -0000 Authentication-Results: pb1.pair.com smtp.mail=me@daveyshafik.com; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=me@daveyshafik.com; sender-id=unknown Received-SPF: error (pb1.pair.com: domain daveyshafik.com from 209.85.216.182 cause and error) X-PHP-List-Original-Sender: me@daveyshafik.com X-Host-Fingerprint: 209.85.216.182 mail-qt0-f182.google.com Received: from [209.85.216.182] ([209.85.216.182:33487] helo=mail-qt0-f182.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 20/0D-52781-4236F875 for ; Wed, 20 Jul 2016 07:40:21 -0400 Received: by mail-qt0-f182.google.com with SMTP id w38so24593313qtb.0 for ; Wed, 20 Jul 2016 04:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daveyshafik-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:from:date:message-id:subject:to; bh=PgNPIeJD4a/CVKEkwNV7UG3mkaEhQEI4cIl4LFqli+A=; b=RiXlfzq9TSwJvwl3DkebRfKqcRx6Qf5w11T75q/6D7PwqbsNRDzO1TelxWEfB6+htA KUALFNGaDS4FfzDov5g0XTDvJHHw7KyJgdzxVMHIl5TeGgBmt0/hIVOv35v8yWRFtray 9Kiu9Gafm425Ay0fgwbDOobIuCpH/U5s5sUDzBv5HWPEVi4C5HCOK1f7bfFimIlkp9xq 1MJb6hV4FHksUq9H5hRyvXT7cdvWUXI3YxClRnp6UiHijbMfn8FCbPkj9vZgh2AWAvJx qf64Z1qHrOFbyOtdPRTA24Ihk4LdioW1VKz5KdOaKXpVWorVfF8RfnBhMN2WOiM9KA8Z EriA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=PgNPIeJD4a/CVKEkwNV7UG3mkaEhQEI4cIl4LFqli+A=; b=B7ISwVYlhIlBYAqcSTd6Owhiu4oGgYXfNlkpKnIi20Ml6fyPBVmPwohHqXOOmpXvdL DVlP+97hbhCOP4xK16szqFhBLzN0TGpBQvnCwugna6CTkOg/dX7Ghc2NvhfXKfSfBezH 495EhqDb2clGSlPLFIy7eOf2rL4rUQKkSQXxCFrneLaggnD2VQUsZ4nEIRIXP++cEpRn IVecWe7IoUfhnuvI4ZBRox7SqjUIixwKELdR3XBGWLDdLRyY3zR/EehDKdv6hUa1M/nc 9LBmDdfrp6BFjkkCaW/Qp9d9GM5y2qJmUvj5w9Ll54oGCNPqhLSaMbj7dL43ki9Dc8uT 0h3w== X-Gm-Message-State: ALyK8tLgDL6uzUR0nYV2qKzJoSuxHoOYBG2db4cABlNpEKaNormjZDAOgtpz+UI6+/N/hZ7moqxMd6PJgOj9ffWo X-Received: by 10.200.45.181 with SMTP id p50mr72362121qta.31.1469014818371; Wed, 20 Jul 2016 04:40:18 -0700 (PDT) MIME-Version: 1.0 Sender: me@daveyshafik.com Received: by 10.237.55.138 with HTTP; Wed, 20 Jul 2016 04:40:17 -0700 (PDT) Date: Wed, 20 Jul 2016 04:40:17 -0700 X-Google-Sender-Auth: bKwTLSdcoJsb2ySVGaRBQCwYnqI Message-ID: To: "internals@lists.php.net" , tyrael@php.net, julien pauli Content-Type: multipart/alternative; boundary=001a113f07306b7ded05380faac4 Subject: PHP-5.6 Branch Currently Broken From: davey@php.net (Davey Shafik) --001a113f07306b7ded05380faac4 Content-Type: text/plain; charset=UTF-8 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 --001a113f07306b7ded05380faac4--