subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1211885 - in /subversion/trunk/subversion: libsvn_client/delete.c tests/cmdline/basic_tests.py
Date Thu, 08 Dec 2011 13:48:06 GMT
Author: philip
Date: Thu Dec  8 13:48:05 2011
New Revision: 1211885

URL: http://svn.apache.org/viewvc?rev=1211885&view=rev
Log:
Followup to r1211859.

* subversion/libsvn_client/delete.c
  (delete_urls_multi_repos): Tweak error message and error code.

* subversion/tests/cmdline/basic_tests.py
  (basic_delete): Adjust expected error.

Modified:
    subversion/trunk/subversion/libsvn_client/delete.c
    subversion/trunk/subversion/tests/cmdline/basic_tests.py

Modified: subversion/trunk/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=1211885&r1=1211884&r2=1211885&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Thu Dec  8 13:48:05 2011
@@ -272,11 +272,11 @@ delete_urls_multi_repos(const apr_array_
           APR_ARRAY_PUSH(relpaths_list, const char *) = repos_relpath;
         }
 
-      /* Check we identified a non-root relpath.  Return an FS error
-         similar to the one further down. */
+      /* Check we identified a non-root relpath.  Return an RA error
+         code for 1.6 compatibility. */
       if (!repos_relpath || !*repos_relpath)
-        return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
-                                 "URL '%s' not within a repository root", uri);
+        return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
+                                 "URL '%s' not within a repository", uri);
 
       /* Now, test to see if the thing actually exists. */
       SVN_ERR(svn_ra_check_path(ra_session, repos_relpath, SVN_INVALID_REVNUM,

Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1211885&r1=1211884&r2=1211885&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Thu Dec  8 13:48:05 2011
@@ -1192,7 +1192,7 @@ def basic_delete(sbox):
                                      iota_URL)
 
   # Issue 4074, deleting a root url SEGV.
-  expected_error = 'svn: E160013: .*not within a repository root'
+  expected_error = 'svn: E170000: .*not within a repository'
   svntest.actions.run_and_verify_svn(None, [], expected_error,
                                      'rm', sbox.repo_url,
                                      '--message', 'delete root')



Mime
View raw message