You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Karl Fogel <kf...@red-bean.com> on 2008/08/20 18:56:45 UTC

Re: svn commit: r32589 - in trunk/subversion: libsvn_wc tests/cmdline

vgeorgescu@tigris.org writes:
> --- trunk/subversion/libsvn_wc/update_editor.c
> +++ trunk/subversion/libsvn_wc/update_editor.c
> @@ -207,6 +208,9 @@ struct dir_baton
>       used for filtering; we have a separate wrapping editor for that. */
>    svn_depth_t ambient_depth;
>  
> +  /* Was the directory marked as incomplete before the update? */
> +  svn_boolean_t was_incomplete;
> +
>    /* The pool in which this baton itself is allocated. */
>    apr_pool_t *pool;
>  };

Would it be correct if I changed this new comment to say:

   /* Was the directory marked as incomplete before the update? 
      (In other words, are we resuming an interrupted update or
      checkout?) */

I thought your comment was fine; I'd just like to add a little more
information to save future readers some speculation time.  But before I
do, I want to make sure what I say is right :-).

> @@ -1579,12 +1588,29 @@ externals_prop_changed(apr_array_header_
>  }
>  
>  static svn_error_t *
> +add_prop_deletion(void *baton, const void *key,
> +                  apr_ssize_t klen, void *val,
> +                  apr_pool_t *pool)
> +{
> +  apr_array_header_t *propchanges = baton;
> +  const char *name = key;
> +  svn_prop_t *prop = apr_array_push(propchanges);
> +
> +  /* Add the deletion of NAME to PROPCHANGES. */
> +  prop->name = name;
> +  prop->value = NULL;
> +
> +  return SVN_NO_ERROR;
> +}

This needs a doc string; I gave it one in r32589.

Thanks for the fix!

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r32589 - in trunk/subversion: libsvn_wc tests/cmdline

Posted by Karl Fogel <kf...@red-bean.com>.
Vlad Georgescu <vg...@gmail.com> writes:
>> Would it be correct if I changed this new comment to say:
>> 
>>    /* Was the directory marked as incomplete before the update? 
>>       (In other words, are we resuming an interrupted update or
>>       checkout?) */
>
> I'd drop 'or checkout', because currently the only user of
> was_incomplete is my bug fix, and the bug can only appear during an
> interrupted update, not checkout.

Done in r32594.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r32589 - in trunk/subversion: libsvn_wc tests/cmdline

Posted by Vlad Georgescu <vg...@gmail.com>.
Karl Fogel wrote:
> vgeorgescu@tigris.org writes:
>> --- trunk/subversion/libsvn_wc/update_editor.c
>> +++ trunk/subversion/libsvn_wc/update_editor.c
>> @@ -207,6 +208,9 @@ struct dir_baton
>>       used for filtering; we have a separate wrapping editor for that. */
>>    svn_depth_t ambient_depth;
>>  
>> +  /* Was the directory marked as incomplete before the update? */
>> +  svn_boolean_t was_incomplete;
>> +
>>    /* The pool in which this baton itself is allocated. */
>>    apr_pool_t *pool;
>>  };
> 
> Would it be correct if I changed this new comment to say:
> 
>    /* Was the directory marked as incomplete before the update? 
>       (In other words, are we resuming an interrupted update or
>       checkout?) */

I'd drop 'or checkout', because currently the only user of was_incomplete is my
bug fix, and the bug can only appear during an interrupted update, not checkout.

> 
>> @@ -1579,12 +1588,29 @@ externals_prop_changed(apr_array_header_
>>  }
>>  
>>  static svn_error_t *
>> +add_prop_deletion(void *baton, const void *key,
>> +                  apr_ssize_t klen, void *val,
>> +                  apr_pool_t *pool)
>> +{
>> +  apr_array_header_t *propchanges = baton;
>> +  const char *name = key;
>> +  svn_prop_t *prop = apr_array_push(propchanges);
>> +
>> +  /* Add the deletion of NAME to PROPCHANGES. */
>> +  prop->name = name;
>> +  prop->value = NULL;
>> +
>> +  return SVN_NO_ERROR;
>> +}
> 
> This needs a doc string; I gave it one in r32589.
> 

Thanks, Karl.


-- 
Vlad

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org