Malcolm Rowe <malcolm-svn-dev@farside.org.uk> writes:
> [ So the code called from svn_fs_fs__create() reads something like:
>
> if --pre-1.4-compatible
> make format 1
> else if --pre-1.5-compatible
> make format 2
> else
> make format 3
> ]
>
> Perhaps we need to make the help text clearer though, if you thought
> you needed both?
Then, unless i'm still confused, we need this change:
Index: subversion/libsvn_fs_base/fs.c
===================================================================
--- subversion/libsvn_fs_base/fs.c (revision 24835)
+++ subversion/libsvn_fs_base/fs.c (working copy)
@@ -637,8 +637,11 @@
if (svn_err) goto error;
/* See if we had an explicitly specified pre 1.4 compatible. */
- if (fs->config && apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_4_COMPATIBLE,
- APR_HASH_KEY_STRING))
+ if (fs->config
+ && (apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_4_COMPATIBLE,
+ APR_HASH_KEY_STRING)
+ || apr_hash_get(fs->config, SVN_FS_CONFIG_PRE_1_5_COMPATIBLE,
+ APR_HASH_KEY_STRING)))
format = 1;
/* This filesystem is ready. Stamp it with a format number. */
Index: subversion/libsvn_repos/repos.c
===================================================================
--- subversion/libsvn_repos/repos.c (revision 24835)
+++ subversion/libsvn_repos/repos.c (working copy)
@@ -1722,7 +1722,9 @@
repos->fs_type = apr_hash_get(fs_config, SVN_FS_CONFIG_FS_TYPE,
APR_HASH_KEY_STRING);
if (apr_hash_get(fs_config, SVN_FS_CONFIG_PRE_1_4_COMPATIBLE,
- APR_HASH_KEY_STRING))
+ APR_HASH_KEY_STRING)
+ || apr_hash_get(fs_config, SVN_FS_CONFIG_PRE_1_5_COMPATIBLE,
+ APR_HASH_KEY_STRING))
repos->format = SVN_REPOS__FORMAT_NUMBER_LEGACY;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 30 19:28:38 2007