You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2022/04/06 13:20:34 UTC

svn commit: r1899616 - in /subversion/branches/pristines-on-demand-on-mwf/subversion: libsvn_wc/wc_db_textbase.c tests/cmdline/authz_tests.py

Author: julianfoad
Date: Wed Apr  6 13:20:34 2022
New Revision: 1899616

URL: http://svn.apache.org/viewvc?rev=1899616&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: revert r1898184 (issue #4888).

This patch was papering over the problem in an incomplete way and so possibly causes more confusion than it fixes.

Modified:
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/authz_tests.py

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c?rev=1899616&r1=1899615&r2=1899616&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c Wed Apr  6 13:20:34 2022
@@ -330,13 +330,6 @@ svn_wc__db_textbase_sync(svn_wc__db_t *d
                                      hydrate_baton, cancel_func, cancel_baton,
                                      checksum, repos_root_url, repos_relpath,
                                      revision, iterpool);
-              /* If read access is unauthorized, for some operations we need
-               * to continue even though we failed to fetch the textbase. */
-              if (err && err->apr_err == SVN_ERR_RA_NOT_AUTHORIZED)
-                {
-                  svn_error_clear(err);
-                  err = SVN_NO_ERROR;
-                }
               if (err)
                 return svn_error_compose_create(err, svn_sqlite__reset(stmt));
             }

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/authz_tests.py?rev=1899616&r1=1899615&r2=1899616&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/authz_tests.py Wed Apr  6 13:20:34 2022
@@ -1613,6 +1613,7 @@ def authz_log_censor_revprops(sbox):
           '-r1', sbox.repo_url])
 
 @Skip(svntest.main.is_ra_type_file)
+@Wimp("Applying delta to a local mod needs access to the text base")
 def remove_access_after_commit(sbox):
   "remove a subdir with authz file"