svn commit: r1404863 - /subversion/trunk/subversion/libsvn_wc/lock.c

[st...@apache.org]

Author: stsp
Date: Fri Nov  2 02:58:39 2012
New Revision: 1404863

URL: http://svn.apache.org/viewvc?rev=1404863&view=rev
Log:
* subversion/libsvn_wc/lock.c
  (svn_wc__internal_check_wc): Don't error out on WCs that now aren't
   auto-upgraded anymore. Treat them the same as missing and unsupported
   WCs to allow checkout of nested working copies within such WCs.
   Fixes the bulk of the test suite failures I introduced in r1404856 if
   the tests are run within a 1.7 format working copy.

Modified:
    subversion/trunk/subversion/libsvn_wc/lock.c

Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=1404863&r1=1404862&r2=1404863&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Fri Nov  2 02:58:39 2012
@@ -98,7 +98,8 @@ svn_wc__internal_check_wc(int *wc_format
       svn_node_kind_t kind;
 
       if (err->apr_err != SVN_ERR_WC_MISSING &&
-          err->apr_err != SVN_ERR_WC_UNSUPPORTED_FORMAT)
+          err->apr_err != SVN_ERR_WC_UNSUPPORTED_FORMAT &&
+          err->apr_err != SVN_ERR_WC_UPGRADE_REQUIRED)
         return svn_error_trace(err);
       svn_error_clear(err);