svn commit: r1804013 - /subversion/trunk/subversion/libsvn_fs_base/fs.c

[da...@apache.org]

Author: danielsh
Date: Thu Aug  3 15:26:39 2017
New Revision: 1804013

URL: http://svn.apache.org/viewvc?rev=1804013&view=rev
Log:
* subversion/libsvn_fs_base/fs.c
  (base_upgrade): Error out on too-new formats.

This changes the behaviour of:

    % svnadmin create r
    % rm -rf r/db/
    % mkdir r/db/
    % echo 5 > r/db/format
    % svnadmin upgrade r 

from:

    % svnadmin upgrade r 
    Repository lock acquired.
    Please wait; upgrading the repository may take some time...
    Bumped repository format to 4
    .
    Upgrade completed.
    % cat r/db/format
    4

to:

    % svnadmin upgrade r 
    svnadmin: E160043: Expected FS format '4'; found format '5'

This is a form of SVN-3744.

Modified:
    subversion/trunk/subversion/libsvn_fs_base/fs.c

Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1804013&r1=1804012&r2=1804013&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/fs.c Thu Aug  3 15:26:39 2017
@@ -957,6 +957,7 @@ base_upgrade(svn_fs_t *fs,
       err = SVN_NO_ERROR;
     }
   SVN_ERR(err);
+  SVN_ERR(check_format(old_format_number));
 
   /* Bump the format file's stored version number. */
   SVN_ERR(svn_io_write_version_file(version_file_path,