You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/01 14:46:16 UTC

svn commit: r1498416 - in /subversion/branches/fsfs-format7/subversion/libsvn_fs_x: fs.h fs_x.c

Author: stefan2
Date: Mon Jul  1 12:46:16 2013
New Revision: 1498416

URL: http://svn.apache.org/r1498416
Log:
On the fsfs-format7 branch:  drop detection of never-released FSFS
format versions.

* subversion/libsvn_fs_x/fs.h
  (SVN_FS_FS__MIN_DELTIFICATION_FORMAT): remove

* subversion/libsvn_fs_x/fs_x.c
  (check_format): simplify

Modified:
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h?rev=1498416&r1=1498415&r2=1498416&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h Mon Jul  1 12:46:16 2013
@@ -153,10 +153,6 @@ extern "C" {
  * issues with very old servers, restrict those options to the 1.6+ format*/
 #define SVN_FS_FS__MIN_DELTIFICATION_FORMAT 4
 
-/* The 1.7-dev format, never released, that packed revprops into SQLite
-   revprops.db . */
-#define SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT 5
-
 /* Private FSFS-specific data shared between all svn_txn_t objects that
    relate to a particular transaction in a filesystem (as identified
    by transaction id and filesystem UUID).  Objects of this type are

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c?rev=1498416&r1=1498415&r2=1498416&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c Mon Jul  1 12:46:16 2013
@@ -212,16 +212,6 @@ svn_fs_x__write_format(svn_fs_t *fs,
 static svn_error_t *
 check_format(int format)
 {
-  /* Blacklist.  These formats may be either younger or older than
-     SVN_FS_FS__FORMAT_NUMBER, but we don't support them. */
-  if (format == SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT)
-    return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
-                             _("Found format '%d', only created by "
-                               "unreleased dev builds; see "
-                               "http://subversion.apache.org"
-                               "/docs/release-notes/1.7#revprop-packing"),
-                             format);
-
   /* We support all formats from 1-current simultaneously */
   if (1 <= format && format <= SVN_FS_FS__FORMAT_NUMBER)
     return SVN_NO_ERROR;