You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/08/02 16:45:48 UTC
svn commit: r1153149 - in /subversion/trunk/subversion:
libsvn_client/externals.c tests/cmdline/externals_tests.py
Author: rhuijben
Date: Tue Aug 2 14:45:44 2011
New Revision: 1153149
URL: http://svn.apache.org/viewvc?rev=1153149&view=rev
Log:
Following up on r1153110, apply the same 'same repository' check on updating
file externals. This resolves the non-ra_local failures caused by r1153110.
* subversion/libsvn_client/externals.c
(handle_external_item_change): Add check.
* subversion/tests/cmdline/externals_tests.py
(file_externals_different_repos): Update expected result.
Modified:
subversion/trunk/subversion/libsvn_client/externals.c
subversion/trunk/subversion/tests/cmdline/externals_tests.py
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1153149&r1=1153148&r2=1153149&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Tue Aug 2 14:45:44 2011
@@ -952,6 +952,11 @@ handle_external_item_change(const struct
scratch_pool));
break;
case svn_node_file:
+ if (strcmp(eb->repos_root_url, ra_cache.repos_root_url))
+ return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+ _("Unsupported external: "
+ "url of file external '%s' is not in repository '%s'"),
+ new_url, eb->repos_root_url);
SVN_ERR(switch_file_external(local_abspath,
new_url,
&new_item->peg_revision,
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1153149&r1=1153148&r2=1153149&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue Aug 2 14:45:44 2011
@@ -1919,7 +1919,7 @@ def file_externals_different_repos(sbox)
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, None,
- '.*svn: warning: W170000:.*')
+ 'svn: warning: W200007: Unsupported.*')
########################################################################