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

Re: svn commit: r935756 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c lock.c update_editor.c wc.h

From: Greg Stein <gstein_at_gmail.com>
Date: Mon, 19 Apr 2010 18:18:41 -0400

On Mon, Apr 19, 2010 at 18:01, <hwright_at_apache.org> wrote:
> Author: hwright
> Date: Mon Apr 19 22:01:30 2010
> New Revision: 935756
>
> URL: http://svn.apache.org/viewvc?rev=935756&view=rev
> Log:
> Remove a temporary API.  This also allows reverting an added directory which is
> the CWD.
>
> * subversion/libsvn_wc/wc.h
>  (svn_wc__temp_get_relpath): Remove.
>
> * subversion/libsvn_wc/adm_ops.c
>  (revert_entry): Don't use the API, and in the process, allow a revert of
>    an added directory if it is the CWD.

You might want to clarify that the code (contrary to issue #854) is
now capable of performing a revert on the current directory.

>...
> +++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Apr 19 22:01:30 2010
>...
> @@ -2029,7 +2014,8 @@ revert_internal(svn_wc__db_t *db,
>                                            pool, pool));
>   if (unversioned && tree_conflict == NULL)
>     return svn_error_createf(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
> -                             _("Cannot revert unversioned item '%s'"), path);
> +                             _("Cannot revert unversioned item '%s'"),
> +                             local_abspath);

Shouldn't this use svn_dirent_local_style() ??

>...
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Apr 19 22:01:30 2010
>...
> @@ -5282,7 +5278,7 @@ make_editor(svn_revnum_t *target_revisio
>                                                 &inner_baton,
>                                                 inner_editor,
>                                                 inner_baton,
> -                                                anchor,
> +                                                anchor_abspath,
>                                                 target_basename,
>                                                 wc_ctx->db,
>                                                 result_pool));

Woah. The ambient depth filter still uses eb->anchor distinctly from
eb->anchor_abspath. You can't make the above change unless/until you
change that filter.

>...

Cheers,
-g
Received on 2010-04-20 00:19:09 CEST

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