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/01/13 19:39:18 UTC
svn commit: r1432696 - in /subversion/branches/fsfs-format7/subversion:
include/svn_fs.h libsvn_fs_fs/fs_fs.c svnadmin/main.c
Author: stefan2
Date: Sun Jan 13 18:39:18 2013
New Revision: 1432696
URL: http://svn.apache.org/viewvc?rev=1432696&view=rev
Log:
On the fsfs-format7 branch: make 'svnadmin create --compatible-version"
accept 1.9.
* subversion/include/svn_fs.h
(SVN_FS_CONFIG_PRE_1_9_COMPATIBLE): new internal option
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__create): handle new option
* subversion/svnadmin/main.c
(subcommand_create): convert "compatible version" into internal option
Modified:
subversion/branches/fsfs-format7/subversion/include/svn_fs.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/fsfs-format7/subversion/svnadmin/main.c
Modified: subversion/branches/fsfs-format7/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/include/svn_fs.h?rev=1432696&r1=1432695&r2=1432696&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/include/svn_fs.h (original)
+++ subversion/branches/fsfs-format7/subversion/include/svn_fs.h Sun Jan 13 18:39:18 2013
@@ -131,6 +131,13 @@ typedef struct svn_fs_t svn_fs_t;
* @since New in 1.8.
*/
#define SVN_FS_CONFIG_PRE_1_8_COMPATIBLE "pre-1.8-compatible"
+
+/** Create repository format compatible with Subversion versions
+ * earlier than 1.9.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_FS_CONFIG_PRE_1_9_COMPATIBLE "pre-1.9-compatible"
/** @} */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.c?rev=1432696&r1=1432695&r2=1432696&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.c Sun Jan 13 18:39:18 2013
@@ -865,6 +865,9 @@ svn_fs_fs__create(svn_fs_t *fs,
else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE,
APR_HASH_KEY_STRING))
format = 4;
+ else if (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_9_COMPATIBLE,
+ APR_HASH_KEY_STRING))
+ format = 6;
}
ffd->format = format;
Modified: subversion/branches/fsfs-format7/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/svnadmin/main.c?rev=1432696&r1=1432695&r2=1432696&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/svnadmin/main.c (original)
+++ subversion/branches/fsfs-format7/subversion/svnadmin/main.c Sun Jan 13 18:39:18 2013
@@ -664,6 +664,9 @@ subcommand_create(apr_getopt_t *os, void
if (! svn_version__at_least(opt_state->compatible_version, 1, 8, 0))
apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE,
APR_HASH_KEY_STRING, "1");
+ if (! svn_version__at_least(opt_state->compatible_version, 1, 9, 0))
+ apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_9_COMPATIBLE,
+ APR_HASH_KEY_STRING, "1");
}
SVN_ERR(svn_repos_create(&repos, opt_state->repository_path,