[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r922511 - /subversion/trunk/subversion/libsvn_client/commit.c

From: Greg Stein <gstein_at_gmail.com>
Date: Thu, 18 Mar 2010 17:25:54 -0400

On Sat, Mar 13, 2010 at 05:27, <philip_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_client/commit.c Sat Mar 13 09:27:20 2010
>...
> @@ -1010,17 +1009,24 @@ static svn_error_t *
>  check_nonrecursive_dir_delete(void *baton, void *this_item, apr_pool_t *pool)
>  {
>   struct check_dir_delete_baton *btn = baton;
> -  const char *target_abspath;
> +  const char *target_abspath, *lock_abspath;
> +  svn_boolean_t locked_here;
> +  svn_node_kind_t kind;
>
>   SVN_ERR(svn_dirent_get_absolute(&target_abspath, *(const char **)this_item,
>                                   pool));
>
> -  {
> -    svn_wc_adm_access_t *adm_access;
> -    SVN_ERR_W(svn_wc_adm_probe_retrieve(&adm_access, btn->base_dir_access,
> -                                        target_abspath, pool),
> -              _("Are all the targets part of the same working copy?"));
> -  }
> +  SVN_ERR(svn_wc__node_get_kind(&kind, btn->wc_ctx, target_abspath, FALSE,
> +                                pool));

... looks at the database ...

>...
> @@ -1040,13 +1046,10 @@ check_nonrecursive_dir_delete(void *bato
>   */
>   if (btn->depth != svn_depth_infinity)
>     {
> -      svn_wc_status2_t *status;
> -      svn_node_kind_t kind;
> -
> -      SVN_ERR(svn_io_check_path(target_abspath, &kind, pool));

... looks at the disk.

Is this change proper and safe? What happens if a file/dir is
obstructed by something of a different kind? Before, it would see what
was *actually* there, not just what it thought *should* be there.

>...

Cheers,
-g
Received on 2010-03-18 22:26:24 CET

This is an archived mail posted to the Subversion Dev mailing list.