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

Re: [PATCH] issue 3620: svn add ^/ triggers assertion failure

From: Uwe Stuehler <uwe_at_bsdx.de>
Date: Thu, 16 Sep 2010 16:24:20 +0200

On Thu, Sep 16, 2010 at 3:26 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> On 09/16/2010 08:59 AM, Uwe Stuehler wrote:
>> Follow-up to r965551 on issue #3620: svn add ^/ triggers assertion failure
>>
>> * subversion/svn/upgrade-cmd.c
>> (svn_cl__upgrade): Check that target arguments aren't URLs before upgrading.
>>
>> * subversion/tests/cmdline/input_validation_tests.py: New test for "upgrade".
>
> Committed in r997741. Thanks, Uwe!
>
> --
> C. Michael Pilato <cmpilato_at_collab.net>
> CollabNet <> www.collab.net <> Distributed Development On Demand
>
>

Thanks! Stefan pointed out that I missed the libsvn_client part, which I have
now attached below.

[[[
Follow-up to r965551 on issue #3620: svn add ^/ triggers assertion failure

* subversion/libsvn_client/cleanup.c (svn_client_upgrade): Check that
path isn't a URL.
]]]

Index: subversion/libsvn_client/cleanup.c
===================================================================
--- subversion/libsvn_client/cleanup.c (revision 997228)
+++ subversion/libsvn_client/cleanup.c (working copy)
@@ -129,6 +129,11 @@
   info_baton.last_repos = NULL;
   info_baton.last_uuid = NULL;

+ if (svn_path_is_url(path))
+ return svn_error_return(svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+ _("'%s' is not a local path"),
+ path));
+
   SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, scratch_pool));
   SVN_ERR(svn_wc_upgrade(ctx->wc_ctx, local_abspath,
                          fetch_repos_info, &info_baton,
Received on 2010-09-16 16:25:00 CEST

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