Re: com php-src: - Fixed bug #62887 (Only /status?plain&full gives "last request cpu"): sapi/fpm/fpm/fpm_status.c
| From: | Christopher Jones | Date: | Fri, 28 Sep 2012 07:03:12 +0000 |
| Subject: | Re: com php-src: - Fixed bug #62887 (Only /status?plain&full gives "last request cpu"): sapi/fpm/fpm/fpm_status.c | ||
| References: | 1 2 3 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-70264@lists.php.net to get a copy of this message | ||
On 09/27/2012 11:25 PM, Jérôme Loyet wrote:
laurence: I know, sorry, but merging never works gently. Each time, I'm in a situation from which I can never exit cleanly. I spend more time dealing with git than working on the patch ... you can easly understand I'm not continuing this way :( for me, it's a pain in the ass since php sources have been migrated to git. if you have a clean and simple solution: I'm all ears :)Look at the "Multiple working copies workflow" on https://wiki.php.net/vcs/gitfaq Chris -- christopher.jones@oracle.com http://twitter.com/#!/ghrd