You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Julian Foad <ju...@wandisco.com> on 2010/08/11 08:22:20 UTC

Re: svn commit: r984007 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

On Tue, 2010-08-10, rhuijben@apache.org wrote:
> Author: rhuijben
> Date: Tue Aug 10 13:46:57 2010
> New Revision: 984007
> 
> URL: http://svn.apache.org/viewvc?rev=984007&view=rev
> Log:
> * subversion/libsvn_wc/update_editor.c
>   (cleanup_dir_baton): When calling wq_run() from pool cleanup, don't pass
>     a cancel func as this will also be called on canceling the operation.
>     And in that case you don't want to cancel running the wq items.

This needs a comment in the code!

- Julian


> Modified:
>     subversion/trunk/subversion/libsvn_wc/update_editor.c
> 
> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=984007&r1=984006&r2=984007&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Aug 10 13:46:57 2010
> @@ -496,7 +496,7 @@ cleanup_dir_baton(void *dir_baton)
>    apr_pool_t *pool = apr_pool_parent_get(db->pool);
>  
>    err = svn_wc__wq_run(eb->db, db->local_abspath,
> -                       eb->cancel_func, eb->cancel_baton,
> +                       NULL /* cancel_func */, NULL /* cancel_baton */,
>                         pool);
>  
>    if (err)
> 
>