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 <[email protected]> Wed, 25 Jul 2012 00:15:30 >> +0000 >> > > 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
