kfogel_at_tigris.org wrote:
> Log:
> * subversion/libsvn_client/merge.c
> (get_mergeinfo_walk_cb): When creating a URL, remember to URI-encode it.
> Also, don't side-effect merge_src_child_path->data.
>
> Patch by: Matthew Inger <mattinger_at_gmail.com>
> (He found where to uri-escape; I just made the no-side-effect tweak.)
[...]
> Modified: trunk/subversion/libsvn_client/merge.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=33109&r1=33108&r2=33109
> ==============================================================================
> --- trunk/subversion/libsvn_client/merge.c Tue Sep 16 14:06:59 2008 (r33108)
> +++ trunk/subversion/libsvn_client/merge.c Tue Sep 16 14:35:30 2008 (r33109)
> @@ -3817,7 +3817,8 @@ get_mergeinfo_walk_cb(const char *path,
> const char *mergeinfo_url =
> svn_path_join(wb->source_root_url,
> /* Skip leading '/' or join won't work. */
> - ++(merge_src_child_path->data),
> + svn_path_uri_encode(
> + merge_src_child_path->data + 1, pool),
> pool);
We already have an API for doing this: svn_path_url_add_component(url,
component, pool).
See 33121.
- Julian
---------------------------------------------------------------------
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-17 12:59:26 CEST