Author: rhuijben
Date: Tue Jul 27 13:43:11 2010
New Revision: 979696
URL: http://svn.apache.org/viewvc?rev=979696&view=rev
Log:
Following up on r979320, make the database know that we upgraded to format
18. This should resolve the property loss experienced when upgrading from
format 17 by upgrading again and again.
* subversion/libsvn_wc/upgrade.c
(bump_to_18): Call schema update.
* subversion/libsvn_wc/wc-metadata.sql
(STMT_UPGRADE_TO_18): Add minimal schema update.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=979696&r1=979695&r2=979696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Jul 27 13:43:11 2010
@@ -1028,6 +1028,8 @@ migrate_props(const char *wcroot_abspath
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
+ SVN_DBG(("Migrating props on %s from %d to 18\n", wcroot_abspath,
original_format));
+
/* Migrate the props for "this dir". */
SVN_ERR(migrate_node_props(wcroot_abspath, "", sdb, original_format,
iterpool));
@@ -1063,10 +1065,8 @@ bump_to_18(void *baton, svn_sqlite__db_t
{
struct bump_to_18_baton *b18 = baton;
-#if 0
/* ### no schema changes (yet)... */
SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_UPGRADE_TO_18));
-#endif
SVN_ERR(migrate_props(b18->wcroot_abspath, sdb, b18->original_format,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=979696&r1=979695&r2=979696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Tue Jul 27 13:43:11
2010
@@ -724,6 +724,14 @@ PRAGMA user_version = 17;
/* ------------------------------------------------------------------------- */
+/* Format 18 involves no schema changes, it moves the property data from files
+ into the database. */
+
+-- STMT_UPGRADE_TO_18
+PRAGMA user_version = 18;
+
+/* ------------------------------------------------------------------------- */
+
/* Format YYY introduces new handling for conflict information. */
-- format: YYY
