Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/TSRM/ tsrm_win32.c

2009-10-09 Thread Pierre Joye
the plan is to get the job done. On Fri, Oct 9, 2009 at 4:46 PM, Hannes Magnusson wrote: > Then what is the plan? Manually merging every.   Commit one at a time and > keep track in a hidden wiki page? > > This mail was sent from my HTC MAGIC. Sorry for any and all typos that may > have been in th

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/TSRM/ tsrm_win32.c

2009-10-09 Thread Hannes Magnusson
Then what is the plan? Manually merging every. Commit one at a time and keep track in a hidden wiki page? This mail was sent from my HTC MAGIC. Sorry for any and all typos that may have been in this mail. On Oct 9, 2009 4:41 p.m., "Pierre Joye" wrote: if svn merge is used, yes, I don't use it

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/TSRM/ tsrm_win32.c

2009-10-09 Thread Pierre Joye
if svn merge is used, yes, I don't use it for these commits. I tried but it fails for the 1st three patches, then I gave up. Cheers, On Fri, Oct 9, 2009 at 4:38 PM, Hannes Magnusson wrote: > Shouldnt you keep track of mergeinfo? > > This mail was sent from my HTC MAGIC. Sorry for any and all typ

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/TSRM/ tsrm_win32.c

2009-10-09 Thread Hannes Magnusson
Shouldnt you keep track of mergeinfo? This mail was sent from my HTC MAGIC. Sorry for any and all typos that may have been in this mail. On Oct 9, 2009 4:06 p.m., "Pierre-Alain Joye" wrote: pajoye Fri, 09 Oct 2009 14:06:35 + Revision: http://svn.php.net/vi