subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bert Huijben" <b...@qqmail.nl>
Subject RE: svn commit: r1210913 - in /subversion/trunk/subversion: libsvn_wc/externals.c tests/cmdline/externals_tests.py tests/cmdline/prop_tests.py tests/cmdline/svntest/actions.py
Date Tue, 06 Dec 2011 14:31:56 GMT


> -----Original Message-----
> From: philip@apache.org [mailto:philip@apache.org]
> Sent: dinsdag 6 december 2011 14:46
> To: commits@subversion.apache.org
> Subject: svn commit: r1210913 - in /subversion/trunk/subversion:
> libsvn_wc/externals.c tests/cmdline/externals_tests.py
> tests/cmdline/prop_tests.py tests/cmdline/svntest/actions.py
> 
> Author: philip
> Date: Tue Dec  6 13:46:21 2011
> New Revision: 1210913
> 
> URL: http://svn.apache.org/viewvc?rev=1210913&view=rev
> Log:
> Fix issue 4073, assert on Windows for abspath in svn:externals.
> 
> * subversion/libsvn_wc/externals.c
>   (svn_wc_parse_externals_description3): Use platform-specific abspath
> check.
> 
> * subversion/tests/cmdline/svntest/actions.py
>   (set_prop): Rename parameter, verify that expected error occurs.
> 
> * subversion/tests/cmdline/externals_tests.py
>   (set_externals_for_path_expect_error): Tweak for renamed parameter.
>   (disallow_dot_or_dotdot_directory_reference): Add issue 4073 case.
> 
> * subversion/tests/cmdline/prop_tests.py
>   (prop_value_conversions): Adjust expected error so that it matches.
> 
> Modified:
>     subversion/trunk/subversion/libsvn_wc/externals.c
>     subversion/trunk/subversion/tests/cmdline/externals_tests.py
>     subversion/trunk/subversion/tests/cmdline/prop_tests.py
>     subversion/trunk/subversion/tests/cmdline/svntest/actions.py
> 
> Modified: subversion/trunk/subversion/libsvn_wc/externals.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/exte
> rnals.c?rev=1210913&r1=1210912&r2=1210913&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_wc/externals.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/externals.c Tue Dec  6 13:46:21
> 2011
> @@ -300,7 +300,8 @@ svn_wc_parse_externals_description3(apr_
> 
>        item->target_dir = svn_dirent_internal_style(item->target_dir, pool);
> 
> -      if (item->target_dir[0] == '\0' || item->target_dir[0] == '/'
> +      if (item->target_dir[0] == '\0'
> +          || svn_dirent_is_absolute(item->target_dir)

I think you should also leave the '/' check as a '/style/path' on Windows is not absolute,
but also not completely relative.

	Bert

>            || svn_path_is_backpath_present(item->target_dir))
>          return svn_error_createf
>            (SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION, NULL,


Mime
View raw message