Author: julianfoad
Date: Wed Feb 2 14:09:07 2022
New Revision: 1897698
URL: http://svn.apache.org/viewvc?rev=1897698&view=rev
Log:
On the 'multi-wc-format' branch: include a place-holder format bump.
This patch merely removes the compile-time conditional around the format
bump. This resolves a compilation error and also makes it easier to merge
with a branch that includes a format bump (such as the 'pristines-on-demand'
branch).
The format bump now included is a no-op. The format number increases from
31 to 32 but nothing about the format is changed, and the client can work
with a WC in either of those formats. This format bump is intended as a
place-holder for some real format change that will be made afterwards.
* subversion/libsvn_wc/wc.h
(SVN_WC__VERSION): Remove '#ifdef SVN_TEST_MULTI_WC_FORMAT'; bump to 32
unconditionally.
* subversion/libsvn_wc/upgrade.c
(bump_to_32,
svn_wc__version_string_from_format,
svn_wc__update_schema): Remove '#ifdef SVN_TEST_MULTI_WC_FORMAT'.
* subversion/libsvn_wc/wc-metadata.sql
Remove '#ifdef SVN_TEST_MULTI_WC_FORMAT', resolving a compile error.
Modified:
subversion/branches/multi-wc-format/subversion/libsvn_wc/upgrade.c
subversion/branches/multi-wc-format/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/multi-wc-format/subversion/libsvn_wc/wc.h
Modified: subversion/branches/multi-wc-format/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/libsvn_wc/upgrade.c?rev=1897698&r1=1897697&r2=1897698&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/libsvn_wc/upgrade.c
(original)
+++ subversion/branches/multi-wc-format/subversion/libsvn_wc/upgrade.c Wed Feb
2 14:09:07 2022
@@ -1426,7 +1426,6 @@ bump_to_31(void *baton,
return SVN_NO_ERROR;
}
-#ifdef SVN_TEST_MULTI_WC_FORMAT
static svn_error_t *
bump_to_32(void *baton,
svn_sqlite__db_t *sdb,
@@ -1435,7 +1434,6 @@ bump_to_32(void *baton,
SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_UPGRADE_TO_32));
return SVN_NO_ERROR;
}
-#endif
static svn_error_t *
upgrade_apply_dav_cache(svn_sqlite__db_t *sdb,
@@ -1638,9 +1636,7 @@ svn_wc__version_string_from_format(int w
case SVN_WC__WC_NG_VERSION: return "1.7";
case 29: return "1.7";
case 31: return "1.8";
-#ifdef SVN_TEST_MULTI_WC_FORMAT
case 32: return "1.15";
-#endif
}
return _("(unreleased development version)");
}
@@ -1802,9 +1798,7 @@ svn_wc__update_schema(int *result_format
{
UPDATE_TO_FORMAT(30);
UPDATE_TO_FORMAT(31);
-#ifdef SVN_TEST_MULTI_WC_FORMAT
UPDATE_TO_FORMAT(32);
-#endif
/* ### future bumps go here. */
#if 0
Modified:
subversion/branches/multi-wc-format/subversion/libsvn_wc/wc-metadata.sql
URL:
http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/libsvn_wc/wc-metadata.sql?rev=1897698&r1=1897697&r2=1897698&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/libsvn_wc/wc-metadata.sql
(original)
+++ subversion/branches/multi-wc-format/subversion/libsvn_wc/wc-metadata.sql
Wed Feb 2 14:09:07 2022
@@ -702,10 +702,8 @@ WHERE l.op_depth = 0
/* ------------------------------------------------------------------------- */
/* Format 32 .... */
-#ifdef SVN_TEST_MULTI_WC_FORMAT
-- STMT_UPGRADE_TO_32
PRAGMA user_version = 32;
-#endif
/* ------------------------------------------------------------------------- */
Modified: subversion/branches/multi-wc-format/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/libsvn_wc/wc.h?rev=1897698&r1=1897697&r2=1897698&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/libsvn_wc/wc.h (original)
+++ subversion/branches/multi-wc-format/subversion/libsvn_wc/wc.h Wed Feb 2
14:09:07 2022
@@ -166,11 +166,7 @@ extern "C" {
*/
/* The default WC version created by the client. */
-#ifdef SVN_TEST_MULTI_WC_FORMAT
-# define SVN_WC__VERSION 32
-#else
-# define SVN_WC__VERSION 31
-#endif
+#define SVN_WC__VERSION 32
/* The minimum WC version supported by the client.
IMPORTANT: Update the implementation of svn_client_supported_wc_version()
