You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/07/07 12:55:25 UTC

Re: svn commit: r37870 - trunk/subversion/libsvn_wc

On Thu, May 28, 2009 at 00:44, Hyrum K. Wright<hy...@hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/entries.c        Wed May 27 15:44:14 2009        (r37870)
>...
> @@ -2373,6 +2378,52 @@ entries_write_body(svn_wc__db_t *db,
>...
> +  SVN_ERR(svn_wc__db_base_get_children(&children, db, local_abspath,
> +                                       scratch_pool, scratch_pool));
> +
> +  for (i = 0; i < children->nelts; i++)
> +    {
> +      const char *child_basename = APR_ARRAY_IDX(children, i, const char *);
> +      const char *child_abspath;
> +
> +      svn_pool_clear(iterpool);
> +      child_abspath = svn_dirent_join(local_abspath, child_basename,
> +                                      scratch_pool);
> +
> +      err = svn_wc__db_base_get_dav_cache(&child_cache, db, child_abspath,
> +                                          scratch_pool, iterpool);
> +      if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
> +        {
> +          /* We could be looking at a newly added node, without a BASE node,
> +             and hence no dav cache, so just ignore the error. */

Not true. You just fetched all the base_children. This can be a simple
SVN_ERR().

>...

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2368810


Re: svn commit: r37870 - trunk/subversion/libsvn_wc

Posted by "Hyrum K. Wright" <hy...@hyrumwright.org>.
On Jul 7, 2009, at 7:55 AM, Greg Stein wrote:

> On Thu, May 28, 2009 at 00:44, Hyrum K.  
> Wright<hy...@hyrumwright.org> wrote:
>> ...
>> +++ trunk/subversion/libsvn_wc/entries.c        Wed May 27 15:44:14  
>> 2009        (r37870)
>> ...
>> @@ -2373,6 +2378,52 @@ entries_write_body(svn_wc__db_t *db,
>> ...
>> +  SVN_ERR(svn_wc__db_base_get_children(&children, db, local_abspath,
>> +                                       scratch_pool, scratch_pool));
>> +
>> +  for (i = 0; i < children->nelts; i++)
>> +    {
>> +      const char *child_basename = APR_ARRAY_IDX(children, i,  
>> const char *);
>> +      const char *child_abspath;
>> +
>> +      svn_pool_clear(iterpool);
>> +      child_abspath = svn_dirent_join(local_abspath, child_basename,
>> +                                      scratch_pool);
>> +
>> +      err = svn_wc__db_base_get_dav_cache(&child_cache, db,  
>> child_abspath,
>> +                                          scratch_pool, iterpool);
>> +      if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
>> +        {
>> +          /* We could be looking at a newly added node, without a  
>> BASE node,
>> +             and hence no dav cache, so just ignore the error. */
>
> Not true. You just fetched all the base_children. This can be a simple
> SVN_ERR().

Ah, true.  r38363.

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2368846