subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r958983 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c wc-metadata.sql
Date Tue, 29 Jun 2010 14:16:17 GMT
Author: philip
Date: Tue Jun 29 14:16:17 2010
New Revision: 958983

URL: http://svn.apache.org/viewvc?rev=958983&view=rev
Log:
Followup to r958918, update the user_version.

* subversion/libsvn_wc/wc-metadata.sql
  (STMT_UPGRADE_TO_17): New.

* subversion/libsvn_wc/upgrade.c
  (bump_to_18): Adjust name of SQL statement in conditional code.
  (bump_to_17): Update user_version.

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=958983&r1=958982&r2=958983&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Jun 29 14:16:17 2010
@@ -1134,7 +1134,7 @@ bump_to_18(void *baton, svn_sqlite__db_t
 
 #if 0
   /* ### no schema changes (yet)... */
-  SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_UPGRADE_TO_17));
+  SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_UPGRADE_TO_18));
 #endif
 
   SVN_ERR(migrate_props(b18->wcroot_abspath, sdb, b18->original_format,
@@ -1229,6 +1229,7 @@ bump_to_17(void *baton, svn_sqlite__db_t
 {
   const char *wcroot_abspath = baton;
 
+  SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_UPGRADE_TO_17));
   SVN_ERR(migrate_text_bases(wcroot_abspath, sdb, scratch_pool));
 
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=958983&r1=958982&r2=958983&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Tue Jun 29 14:16:17 2010
@@ -583,6 +583,13 @@ SET locked_levels = 0;
 
 PRAGMA user_version = 16;
 
+/* ------------------------------------------------------------------------- */
+
+/* Format 17 involves no schema changes, it moves the pristine files
+   from .svn/text-base to .svn/pristine */
+
+-- STMT_UPGRADE_TO_17
+PRAGMA user_version = 17;
 
 /* ------------------------------------------------------------------------- */
 



Mime
View raw message