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

Re: svn commit: r983766 - /subversion/branches/performance/subversion/libsvn_client/export.c

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Mon, 9 Aug 2010 13:42:14 -0500

Should this fix be made on trunk?

To make sure that bug fixes get the broadest coverage, we fix bugs on
trunk, and then backport them to feature and/or release branches. It
may seem like some additional overhead, since you've (currently) only
got commit priviledges on the performance-improvement branch, but it
helps make sure bugs get fixed more broadly, and prevents merge
conflicts. It also keeps the changes happening on the branch
on-topic.

Thanks for finding the fixes for these bugs, though. :)

-Hyrum

On Mon, Aug 9, 2010 at 1:33 PM, <stefan2_at_apache.org> wrote:
> Author: stefan2
> Date: Mon Aug  9 18:33:53 2010
> New Revision: 983766
>
> URL: http://svn.apache.org/viewvc?rev=983766&view=rev
> Log:
> Fix the root cause of an assertion triggered by exporting KDE /trunk:
> File names need to be canonicalized when forming URLs.
>
> * subversion/libsvn_client/export.c
>  (add_file): properly escape the file's URL
>
> Modified:
>    subversion/branches/performance/subversion/libsvn_client/export.c
>
> Modified: subversion/branches/performance/subversion/libsvn_client/export.c
> URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_client/export.c?rev=983766&r1=983765&r2=983766&view=diff
> ==============================================================================
> --- subversion/branches/performance/subversion/libsvn_client/export.c (original)
> +++ subversion/branches/performance/subversion/libsvn_client/export.c Mon Aug  9 18:33:53 2010
> @@ -708,7 +708,12 @@ add_file(const char *path,
>   struct edit_baton *eb = pb->edit_baton;
>   struct file_baton *fb = apr_pcalloc(pool, sizeof(*fb));
>   const char *full_path = svn_dirent_join(eb->root_path, path, pool);
> -  const char *full_url = svn_uri_join(eb->root_url, path, pool);
> +
> +  /* path is not canonicalized, i.e. it may still contain spaces etc. */
> +  const char *full_url = svn_uri_canonicalize(svn_uri_join(eb->root_url,
> +                                                           path,
> +                                                           pool),
> +                                              pool);
>
>   fb->edit_baton = eb;
>   fb->path = full_path;
>
>
>
Received on 2010-08-09 20:42:52 CEST

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