subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1615203 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_fs_fs/fs_fs.c subversion/tests/cmdline/svntest/main.py
Date Fri, 01 Aug 2014 18:59:35 GMT
Author: svn-role
Date: Fri Aug  1 18:59:34 2014
New Revision: 1615203

URL: http://svn.apache.org/r1615203
Log:
Merge the r1547454 group from trunk:

 * r1547454, r1561703
   In FSFS, omit config file when creating pre-1.5 format repositories.
   Justification:
     Old SVN versions won't preserve this file in hotcopy.  Later versions
     might also behave inconsistently in the presence of this file if their
     feature availability check is incomplete.
   Votes:
     +1: stefan2, breser, ivan

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1547454,1561703

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1615203&r1=1615202&r2=1615203&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Aug  1 18:59:34 2014
@@ -189,15 +189,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1547454, r1561703
-   In FSFS, omit config file when creating pre-1.5 format repositories.
-   Justification:
-     Old SVN versions won't preserve this file in hotcopy.  Later versions
-     might also behave inconsistently in the presence of this file if their
-     feature availability check is incomplete.
-   Votes:
-     +1: stefan2, breser, ivan
-
  * r1565531, r1566503, r1568349, r1568361
    Ignore the CommonName in SSL certs when there are Subject Alt Names.
    Justification:

Modified: subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1615203&r1=1615202&r2=1615203&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c Fri Aug  1 18:59:34 2014
@@ -8877,7 +8877,12 @@ svn_fs_fs__create(svn_fs_t *fs,
 
   SVN_ERR(write_revision_zero(fs));
 
-  SVN_ERR(write_config(fs, pool));
+  /* Create the fsfs.conf file if supported.  Older server versions would
+     simply ignore the file but that might result in a different behavior
+     than with the later releases.  Also, hotcopy would ignore, i.e. not
+     copy, a fsfs.conf with old formats. */
+  if (ffd->format >= SVN_FS_FS__MIN_CONFIG_FILE)
+    SVN_ERR(write_config(fs, pool));
 
   SVN_ERR(read_config(ffd, fs->path, pool));
 

Modified: subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py?rev=1615203&r1=1615202&r2=1615203&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py Fri Aug  1 18:59:34
2014
@@ -922,7 +922,8 @@ def create_repos(path, minor_version = N
 
   if options.fs_type is None or options.fs_type == 'fsfs':
     # fsfs.conf file
-    if options.config_file is not None:
+    if options.config_file is not None and \
+       (not minor_version or minor_version >= 6):
       shutil.copy(options.config_file, get_fsfs_conf_file_path(path))
 
     # format file



Mime
View raw message