Author: rhuijben
Date: Sat Jun 30 21:12:43 2012
New Revision: 1355816
URL: http://svn.apache.org/viewvc?rev=1355816&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
(STMT_SELECT_ACTUAL_CHILDREN_TREE_CONFLICT): Remove no longer used query.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1355816&r1=1355815&r2=1355816&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Sat Jun 30 21:12:43
2012
@@ -755,11 +755,6 @@ WHERE wc_id = ?1 AND parent_relpath = ?2
AND ((prop_reject IS NOT NULL) OR (conflict_old IS NOT NULL)
OR (conflict_new IS NOT NULL) OR (conflict_working IS NOT NULL))
--- STMT_SELECT_ACTUAL_CHILDREN_TREE_CONFLICT
-SELECT local_relpath, tree_conflict_data
-FROM actual_node
-WHERE wc_id = ?1 AND parent_relpath = ?2 AND tree_conflict_data IS NOT NULL
-
-- STMT_CLEAR_TEXT_CONFLICT
UPDATE actual_node SET
conflict_old = NULL,
