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

Re: svn commit: r899790 - /subversion/trunk/subversion/libsvn_wc/workqueue.c

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 15 Jan 2010 17:13:36 -0500

On Fri, Jan 15, 2010 at 14:54, <hwright_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri Jan 15 19:54:47 2010
>...
> @@ -1217,12 +1217,13 @@
>           is_file = (kind == svn_wc__db_kind_file ||
>                      kind == svn_wc__db_kind_symlink);
>
> -          SVN_ERR(svn_wc__get_entry(&child_entry, db, child_abspath,
> -                                    FALSE,
> -                                    is_file ? svn_node_file : svn_node_dir,
> -                                    !is_file, iterpool, iterpool));
> +          SVN_ERR(svn_wc__db_read_info(&status, NULL, NULL, NULL, NULL, NULL,
> +                                       NULL, NULL, NULL, NULL, NULL, NULL,
> +                                       NULL, NULL, NULL, NULL, NULL, NULL,
> +                                       NULL, NULL, NULL, NULL, NULL, NULL,
> +                                       db, child_abspath, iterpool, iterpool));
>
> -          if (child_entry->schedule != svn_wc_schedule_delete)
> +          if (status != svn_wc__db_status_deleted)
>             continue;

I think you need to check for status_obstructed_delete, too.

Cheers,
-g
Received on 2010-01-15 23:14:11 CET

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