Author: rhuijben
Date: Thu Jul 5 17:47:04 2012
New Revision: 1357765
URL: http://svn.apache.org/viewvc?rev=1357765&view=rev
Log:
Commit some schema file changes that should have been part of r1357760.
* subversion/libsvn_wc/wc-metadata.sql
(STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE,
STMT_UPGRADE_30_SET_CONFLICT): New statements.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1357765&r1=1357764&r2=1357765&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Jul 5 17:47:04
2012
@@ -785,6 +785,23 @@ 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;
+-- STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE
+SELECT wc_id, local_relpath,
+ conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data
+FROM actual_node
+WHERE conflict_old IS NOT NULL
+ OR conflict_working IS NOT NULL
+ OR conflict_new IS NOT NULL
+ OR prop_reject IS NOT NULL
+ OR tree_conflict_data IS NOT NULL
+ORDER by wc_id, local_relpath
+
+-- STMT_UPGRADE_30_SET_CONFLICT
+UPDATE actual_node SET conflict_data = ?2, conflict_old = NULL,
+ conflict_working = NULL, conflict_new = NULL, prop_reject = NULL,
+ tree_conflict_data = NULL
+WHERE wc_id = ?0 and local_relpath = ?1
+
/* ------------------------------------------------------------------------- */
/* Format YYY introduces new handling for conflict information. */
