Re: svn commit: r37734 - in trunk/subversion: include libsvn_client libsvn_wc

[Greg Stein <gs...@gmail.com>]

On Fri, May 15, 2009 at 07:40, Hyrum K. Wright<hy...@hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/upgrade.c        Thu May 14 22:40:17 2009        (r37734)
> @@ -423,26 +423,20 @@ upgrade_format(svn_wc_adm_access_t *adm_
>
>
>  svn_error_t *
> -svn_wc_upgrade(const char *path,
> +svn_wc_upgrade(svn_wc_context_t *wc_ctx,
> +               const char *local_abspath,
>                svn_cancel_func_t cancel_func,
>                void *cancel_baton,
>                apr_pool_t *scratch_pool)
>  {
> -  svn_wc__db_t *db;
> -  const char *local_abspath;
>   int wc_format_version;
>
> -  SVN_ERR(svn_wc__db_open(&db, svn_wc__db_openmode_readwrite,
> -                          NULL /* ### config */, scratch_pool, scratch_pool));
> -
> -  SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, scratch_pool));
> -
> -  SVN_ERR(svn_wc__internal_check_wc(&wc_format_version, db, local_abspath,
> -                                    scratch_pool));
> +  SVN_ERR(svn_wc__internal_check_wc(&wc_format_version, wc_ctx->db,
> +                                    local_abspath, scratch_pool));
>
>   if (wc_format_version < SVN_WC__VERSION)
> -    SVN_ERR(upgrade_working_copy(db, path, cancel_func, cancel_baton,
> -                                 scratch_pool));
> +    SVN_ERR(upgrade_working_copy(wc_ctx->db, local_abspath, cancel_func,
> +                                 cancel_baton, scratch_pool));

upgrade_working_copy() is not designed to take an abspath. It
creates/steals a write lock using that path, and access batons should
only use relative paths.

>...

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2368795