Re: svn commit: r1199222 - in /subversion/branches/showing-merge-info/subversion: include/private/svn_client_private.h libsvn_client/mergeinfo.c libsvn_client/ra.c svn/mergeinfo-cmd.c

[Philip Martin <ph...@wandisco.com>]

julianfoad@apache.org writes:

> Author: julianfoad
> Date: Tue Nov  8 12:54:43 2011
> New Revision: 1199222
>
> URL: http://svn.apache.org/viewvc?rev=1199222&view=rev
> Log:
> On the 'showing-merge-info' branch: Account for renaming of the source
> branch over its lifetime.

> +svn_error_t *
> +svn_client__get_location_segments(apr_array_header_t **segments,
> +                                  const svn_client_peg_t *target,
> +                                  const svn_opt_revision_t *young_revision,
> +                                  const svn_opt_revision_t *old_revision,
> +                                  svn_client_ctx_t *ctx,
> +                                  apr_pool_t *result_pool,
> +                                  apr_pool_t *scratch_pool)
> +{
> +  svn_ra_session_t *ra_session;
> +  const char *young_url, *old_url = NULL;
> +  svn_revnum_t rev, young_rev, old_rev = SVN_INVALID_REVNUM;
> +
> +  SVN_ERR(svn_client__ra_session_from_peg(&ra_session, &rev, NULL,
> +                                          target, &target->peg_revision,
> +                                          ctx, scratch_pool));
> +  SVN_ERR(svn_client__repos_locations(&young_url, &young_rev,
> +                                      &old_url, &old_rev,
> +                                      ra_session, "", &target->peg_revision,
> +                                      young_revision, old_revision,
> +                                      ctx, scratch_pool));

After this change when I do "svn mergeinfo ^/X wc" it fails here because
"" is not a working copy.

> +  SVN_ERR(svn_client__repos_location_segments(segments, ra_session, "", rev,
> +                                              young_rev, old_rev,
> +                                              ctx, result_pool));
> +  return SVN_NO_ERROR;
> +}
> +

-- 
Philip

Re: svn commit: r1199222 - in /subversion/branches/showing-merge-info/subversion: include/private/svn_client_private.h libsvn_client/mergeinfo.c libsvn_client/ra.c svn/mergeinfo-cmd.c

[Julian Foad <ju...@btopenworld.com>]

Philip Martin wrote:
> After this change when I do "svn mergeinfo ^/X wc" it fails
> here because "" is not a working copy.

Thanks Philip.  Fixed in r1199271.

- Julian