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 <hannes.magnus...@gmail.com> wrote: > 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" <paj...@php.net> wrote: > > pajoye Fri, 09 Oct 2009 14:06:35 +0000 > > Revision: http://svn.php.net/viewvc?view=revision&revision=289415 > > Log: > - Merge revision 288028, use of the user token by default, and fix for touch > and directory on windows > > Changed paths: > U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c > > Modified: php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c > =================================================================== > --- php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c 2009-10-09 14:05:13 > UTC (rev 289414) > +++ php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c 2009-10-09 14:06:35 > UTC (rev 289415) > @@ -200,7 +200,7 @@ > > /* Keep the result in realpath_cache */ > if(bucket != NULL) { > - if(desired_access == FILE_GENERIC_READ) { > + if(desired_access == > (FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) { > bucket->is_rvalid = 1; > bucket->is_readable = fAccess; > } > @@ -318,7 +318,7 @@ > char *ptype = (char *)type; > HANDLE thread_token = NULL; > HANDLE token_user = NULL; > - BOOL asuser = FALSE; > + BOOL asuser = TRUE; > > TSRMLS_FETCH(); > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
