subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kot...@apache.org
Subject svn commit: r1816425 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py
Date Mon, 27 Nov 2017 10:57:23 GMT
Author: kotkov
Date: Mon Nov 27 10:57:23 2017
New Revision: 1816425

URL: http://svn.apache.org/viewvc?rev=1816425&view=rev
Log:
Following up on r1816402, match the server minor version (9) to the newly
available fsfs prepackaged repositories of format 7.

* subversion/tests/cmdline/svntest/main.py
  (parse_options): Add a check for fsfs_version = 7.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1816425&r1=1816424&r2=1816425&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Mon Nov 27 10:57:23 2017
@@ -2217,6 +2217,12 @@ def parse_options(arglist=sys.argv[1:],
 
   # Make sure the server-minor-version matches the fsfs-version parameter.
   if options.fsfs_version:
+    if options.fsfs_version == 7:
+      if options.server_minor_version \
+        and options.server_minor_version != 9 \
+        and options.server_minor_version != SVN_VER_MINOR:
+        parser.error("--fsfs-version=7 requires --server-minor-version=9")
+      options.server_minor_version = 9
     if options.fsfs_version == 6:
       if options.server_minor_version \
         and options.server_minor_version != 8 \



Mime
View raw message