svn commit: r1357817 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c wc-metadata.sql

[rh...@apache.org]

Author: rhuijben
Date: Thu Jul  5 19:18:19 2012
New Revision: 1357817

URL: http://svn.apache.org/viewvc?rev=1357817&view=rev
Log:
* subversion/libsvn_wc/upgrade.c
  (svn_wc__upgrade_sdb): Enable when working copy version >= 30.

* subversion/libsvn_wc/wc-metadata.sql
  (STMT_UPGRADE_TO_30): Update schema version.
  (STMT_UPGRADE_30_SET_CONFLICT): Fix argument indexes.

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=1357817&r1=1357816&r2=1357817&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Jul  5 19:18:19 2012
@@ -1834,7 +1834,7 @@ svn_wc__upgrade_sdb(int *result_format,
         *result_format = 29;
         /* FALLTHROUGH  */
 
-#ifdef NOT_YET
+#if SVN_WC__VERSION >= 30
       case 29:
         SVN_ERR(svn_sqlite__with_transaction(sdb, bump_to_30, &bb,
                                              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=1357817&r1=1357816&r2=1357817&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Jul  5 19:18:19 2012
@@ -785,6 +785,8 @@ CREATE INDEX IF NOT EXISTS I_PRISTINE_MD
    working copies that were never updated by 1.7.0+ style clients */
 UPDATE nodes SET file_external=1 WHERE file_external IS NOT NULL;
 
+PRAGMA user_version = 30;
+
 -- STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE
 SELECT wc_id, local_relpath,
   conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data
@@ -797,10 +799,10 @@ WHERE conflict_old IS NOT NULL
 ORDER by wc_id, local_relpath
 
 -- STMT_UPGRADE_30_SET_CONFLICT
-UPDATE actual_node SET conflict_data = ?2, conflict_old = NULL,
+UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL,
   conflict_working = NULL, conflict_new = NULL, prop_reject = NULL,
   tree_conflict_data = NULL
-WHERE wc_id = ?0 and local_relpath = ?1
+WHERE wc_id = ?1 and local_relpath = ?2
 
 /* ------------------------------------------------------------------------- */