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

Re: Subversion 1.5 beta1, "malformed URL for repository"

From: Fyodor Sheremetyev <fyodor_at_visualsvn.com>
Date: Sun, 7 Sep 2008 15:29:12 +0400

On Tue, Sep 2, 2008 at 11:13 AM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> "Fyodor Sheremetyev" <fyodor_at_visualsvn.com> writes:
>> I'm trying to fix this problem. Attached is a short and dirty patch
>> that makes my reproduction script work. But I'm absolutely unsure that
>> it fixes the problem correctly.
>> I see no consistency in using svn_path_uri_encode and
>> svn_path_uri_decode in the code and couldn't find any guidelines
>> regarding uri encoding. Which level should do that by design? Please
>> could somebody point at the right direction.
> I think your patch is correct. I've quoted it below so others can see
> it. A couple of comments:
> 1. A log message always helps :-). See
> http://subversion.tigris.org/hacking.html#log-messages
> 2. You attached it with MIME-type "application/octet-stream", which
> means that mailreaders can't display it inline. If you use
> "text/plain" instead, that makes things a bit easier. See
> http://subversion.tigris.org/hacking.html#patches
> The guideline for URI encoding and decoding is just to follow the doc
> strings of whatever functions the data will be passed to. If the
> function says it needs URI-encoded data, then make sure it receives
> that. If it does not, then usually it takes un-encoded data.
> -Karl

Please find attached a bit more polished patch with an appropriate test.

Fix "Malformed URL" error on "merge --reintegrate" for a path with spaces.

* subversion/tests/cmdline/merge_tests.py
 (merge_file_with_space_in_its_path): New test.
 (test_list): Run the new test.

* subversion/libsvn_client/merge.c
 (calculate_left_hand_side): URI-encode URLs constructed from URI-decoded
  relative paths.

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-07 13:29:26 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.