Thanks! Daniel (I had this sitting in my wc too, but hadn't got to it)
s...@apache.org wrote on Sun, Aug 01, 2010 at 10:58:20 -0000: > Author: stsp > Date: Sun Aug 1 10:58:20 2010 > New Revision: 981201 > > URL: http://svn.apache.org/viewvc?rev=981201&view=rev > Log: > * subversion/libsvn_fs_fs/fs_fs.c > (upgrade_body): Tweak the logic checking for the node kind of fsfs.conf such > that it will return an error in the default case, e.g. for svn_node_unknown > as well as svn_node_dir. Or any other node_kind_t value we may add in the > future... Adjust the error message accordingly. Note that this is safe for > symlinked fsfs.conf because symlinks are recognized as svn_node_file. > > Suggested by: danielsh > > Modified: > subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c > > Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=981201&r1=981200&r2=981201&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original) > +++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Sun Aug 1 10:58:20 2010 > @@ -1288,16 +1288,16 @@ upgrade_body(void *baton, apr_pool_t *po > case svn_node_none: > SVN_ERR(write_config(fs, pool)); > break; > - case svn_node_dir: > + case svn_node_file: > + break; > + default: > return svn_error_return(svn_error_createf(SVN_ERR_FS_GENERAL, NULL, > - _("'%s' is a directory. " > - "Please move it out of " > + _("'%s' is not a regular > file." > + " Please move it out of " > "the way and try again"), > svn_dirent_join(fs->path, > PATH_CONFIG, > pool))); > - default: > - break; > } > > /* If we're already up-to-date, there's nothing else to be done here. */ > >
