Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de
Hi! On 7/24/12 5:15 PM, Johannes Schlüter wrote: Branch: PHP-5.4 Deleted commits count: 2298 User: Johannes Schlüter johan...@php.net Wed, 25 Jul 2012 00:15:30 + What does this push do? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de
Hi, for some reason master was merged into the PHP-5.4 branch. I undid this change in the repo. If you pulled in between your next pull should result in an error. Use git reset --hard origin/PHP-5.4 to reset your local checkout to the current version on the server. johannes On Wed, 2012-07-25 at 00:15 +, Johannes Schlüter wrote: Branch: PHP-5.4 Deleted commits count: 2298 User: Johannes Schlüter johan...@php.net Wed, 25 Jul 2012 00:15:30 + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de
On 07/24/2012 05:18 PM, Stas Malyshev wrote: Hi! On 7/24/12 5:15 PM, Johannes Schlüter wrote: Branch: PHP-5.4 Deleted commits count: 2298 User: Johannes Schlüter johan...@php.net Wed, 25 Jul 2012 00:15:30 + What does this push do? It reverses the mess I caused. I had no idea I did it, and the commit messages didn't show it, but I merged master into 5.4 and pushed it. The commit message just showed the trivial sun/sock fpm change, but what actually happened was that I changed the 5.4 tree into master at the same time. I really really hate that a simple client-side mistake can cause silent massive code changes like this. So, what I did to cause it was to do a 'git rebase master' in the 5.4 branch. Just muscle memory from working all day in an environment where we develop in master all the time. The forced-push restriction we put in to try to prevent this kind of mass-repo-fuck doesn't catch this particular kind of fuckyness. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
