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

Re: Issue with merging files containing spaces

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 23 Sep 2008 00:08:39 +0100

Matthew Inger wrote:
> turns out this is not the only problem I'm having now. it gets
> through this portion and generates this
> error:
>
> svn: Working copy path '/folder/path with spaces/' does not exist in
> repository.
>
>
> I'm not really sure where to look in order to patch this so it
> works.

I would suggest searching the source code for "svn_path_join" followed
by something that looks like a URL followed by something that is not
URI-encoded.

You could start with 'grep "svn_path_join.*url"'.

I had a quick look like this a few days ago and I'm pretty sure I saw a
few places that looked like obvious fixes were needed.

We have an API "svn_path_url_add_component" for adding a not-yet-encoded
component to a URL; we probably should have another API for adding a
URI-encoded component to a URI/URL. ("svn_uri_join"?)

- Julian

> On Tue, Sep 16, 2008 at 5:37 PM, Karl Fogel <kfogel_at_red-bean.com>
> wrote:
> "Matthew Inger" <mattinger_at_gmail.com> writes:
>
> > I am working on it, and have narrowed down to the
> > get_mergeinfo_walk_cb function in libsvn_client/merge.c.
> >
> > There's a call to svn_client__ensure_ra_session_url which
> generates
> > the error when called with a path which includes spaces.
> This should
> > be modified so that the "mergeinfo_url" variable is
> constructed using
> > a call to the "svn_path_uri_encode" function:
> >
> > at line 3364 of merge.c
> > ---------------------------------------
> > const char *mergeinfo_url =
> > svn_path_join(web->source_root_url,
> > /* Skip leading '/' or join won't work. */
> > svn_path_uri_encode(++(merge_src_child_path->data),
> pool),
> > pool);
> >
> > If you want an actual patch file, I can get the code out of
> the
> > repository, but it's a pretty small change anyway.
>
>
> Nah, no need -- I committed the fix in r33109. Thanks for
> tracing this
> one down.
>
> -Karl

---------------------------------------------------------------------
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-23 01:08:58 CEST

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