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

[ju...@apache.org]

Author: julianfoad
Date: Sat Dec 18 00:25:28 2010
New Revision: 1050548

URL: http://svn.apache.org/viewvc?rev=1050548&view=rev
Log:
* subversion/libsvn_wc/lock.c
  (open_single): Replace an error report that 'should never be reached' with
    an assertion.

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=1050548&r1=1050547&r2=1050548&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Sat Dec 18 00:25:28 2010
@@ -543,18 +543,8 @@ open_single(svn_wc_adm_access_t **adm_ac
 
   /* The format version must match exactly. Note that wc_db will perform
      an auto-upgrade if allowed. If it does *not*, then it has decided a
-     manual upgrade is required.
-
-     Note: if it decided on a manual upgrade, then we "should" never even
-     reach this code. An error should have been raised earlier.  */
-  if (wc_format != SVN_WC__VERSION)
-    {
-      return svn_error_createf(SVN_ERR_WC_UPGRADE_REQUIRED, NULL,
-                               _("Working copy format of '%s' is too old (%d); "
-                                 "please run 'svn upgrade'"),
-                               svn_dirent_local_style(path, scratch_pool),
-                               wc_format);
-    }
+     manual upgrade is required and it should have raised an error.  */
+  SVN_ERR_ASSERT(wc_format == SVN_WC__VERSION);
 
   /* Need to create a new lock */
   SVN_ERR(adm_access_alloc(&lock, path, db, db_provided, write_lock,