subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Stein <gst...@gmail.com>
Subject Re: svn commit: r947159 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Date Thu, 03 Jun 2010 00:30:37 GMT
On Fri, May 21, 2010 at 16:17,  <philip@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri May 21 20:17:19 2010
> @@ -3227,6 +3227,7 @@ absent_file_or_dir(const char *path,
>   const char *repos_root_url;
>   const char *repos_uuid;
>   svn_boolean_t is_added;
> +  svn_node_kind_t existing_kind;
>   svn_wc__db_kind_t db_kind
>     = kind == svn_node_dir ? svn_wc__db_kind_dir : svn_wc__db_kind_file;
>
> @@ -3234,13 +3235,19 @@ absent_file_or_dir(const char *path,
>
>   /* If an item by this name is scheduled for addition that's a
>      genuine tree-conflict.  */
> -  SVN_ERR(svn_wc__node_is_added(&is_added, eb->wc_ctx, local_abspath, pool));
> -  if (is_added)
> -    return svn_error_createf(
> +  SVN_ERR(svn_wc_read_kind(&existing_kind, eb->wc_ctx, local_abspath, TRUE,
> +                           pool));
> +  if (existing_kind != svn_node_none)
> +    {
> +      SVN_ERR(svn_wc__node_is_added(&is_added, eb->wc_ctx, local_abspath,
> +                                    pool));

The read_kind() call absorbs ERR_WC_PATH_NOT_FOUND, which you could do
yourself here, and compress these two calls into a single read_info()
call to get the status.

>...

Cheers,
-g

Mime
View raw message