Re: svn commit: r948165 - in /subversion/trunk/subversion/libsvn_client: client.h commit.c copy.c locking_commands.c mergeinfo.c ra.c switch.c update.c

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

On Tue, May 25, 2010 at 14:44,  <hw...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Tue May 25 18:44:49 2010
> @@ -1597,12 +1597,13 @@ location_from_path_and_rev(const char **
>   svn_ra_session_t *ra_session;
>   apr_pool_t *subpool = svn_pool_create(pool);
>   svn_revnum_t rev;
> +  const char *local_abspath;
> +
> +  if (!svn_path_is_url(path_or_url))
> +    SVN_ERR(svn_dirent_get_absolute(&local_abspath, path_or_url, subpool));
>
>   SVN_ERR(svn_client__ra_session_from_path(&ra_session, &rev, url,
> -                                           path_or_url,
> -                                           !svn_path_is_url(path_or_url)
> -                                             ? path_or_url
> -                                             : NULL,
> +                                           path_or_url, local_abspath,
>                                            peg_revision, peg_revision,
>                                            ctx, subpool));

local_abspath should be initialized to NULL for equivalence.

>...

Cheers,
-g