Philip Martin wrote: >Philip Martin <[EMAIL PROTECTED]> writes: > > > >>Eeek! >> >>I've just upgraded to apache/apr/apr-util to HEAD and now I can >>reproduce this. >> >>$ svnadmin create repo >>$ svn mkdir file://`pwd`/repo/foo >>$ svn co file://`pwd`/repo wc >>$ svn up wc >>../svn/subversion/libsvn_wc/adm_crawler.c:315: (apr_err=155000, src_err=0) >>svn: Obstructed update >>svn: The entry 'bar' is no longer a directory, >>which prevents proper updates. >>Please remove this entry and try updating again. >> >> > >Looks like a recent apr change causes apr_dir_read to fail to return >all the requested information. I don't know if this is complete from >an apr point of view, but it's sufficient to get Subversion working on >my glibc 2.2.5 Linux machine. > > >Index: apr/file_io/unix/dir.c >=================================================================== >RCS file: /home/cvspublic/apr/file_io/unix/dir.c,v >retrieving revision 1.69 >diff -u -r1.69 dir.c >--- apr/file_io/unix/dir.c 15 Dec 2002 05:17:51 -0000 1.69 >+++ apr/file_io/unix/dir.c 17 Dec 2002 00:49:35 -0000 >@@ -218,10 +218,10 @@ > return ret; > } > >-#ifdef DIRENT_INODE >+#ifndef DIRENT_INODE > wanted &= ~APR_FINFO_INODE; > #endif >-#ifdef DIRENT_TYPE >+#ifndef DIRENT_TYPE > wanted &= ~APR_FINFO_TYPE; > #endif > > > Yup, your patch fixes my problem, too. Committed in version 1.70. Thanks!
-- Brane Äibej <[EMAIL PROTECTED]> http://www.xbc.nu/brane/
