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

Re: svn commit: r33121 - trunk/subversion/libsvn_client

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Fri, 19 Sep 2008 12:50:22 -0400

julianfoad_at_tigris.org writes:
> Log:
> A small code simplification. A follow-up to r33109.
>
> * subversion/libsvn_client/merge.c
> (get_mergeinfo_walk_cb): Use svn_path_url_add_component() to add a
> component to a URL, rather than doing it in two steps.

Thanks, Julian -- I shoulda done that in the first place.

-Karl

> Modified:
> trunk/subversion/libsvn_client/merge.c
>
> Modified: trunk/subversion/libsvn_client/merge.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=33121&r1=33120&r2=33121
> ==============================================================================
> --- trunk/subversion/libsvn_client/merge.c Wed Sep 17 03:28:22 2008 (r33120)
> +++ trunk/subversion/libsvn_client/merge.c Wed Sep 17 03:58:40 2008 (r33121)
> @@ -3996,11 +3996,10 @@ get_mergeinfo_walk_cb(const char *path,
> svn_error_t *err;
> const char *original_ra_url = NULL;
> const char *mergeinfo_url =
> - svn_path_join(wb->source_root_url,
> - /* Skip leading '/' or join won't work. */
> - svn_path_uri_encode(
> - merge_src_child_path->data + 1, pool),
> - pool);
> + svn_path_url_add_component(wb->source_root_url,
> + /* Skip leading '/'. */
> + merge_src_child_path->data + 1,
> + pool);
> svn_opt_revision_t *start_revision, *end_revision;
> const char *start_url, *end_url;
> svn_opt_revision_t peg_rev, rev1_opt, rev2_opt;
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-19 18:50:31 CEST

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