subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1357388 - /subversion/trunk/subversion/libsvn_wc/wc-queries.sql
Date Wed, 04 Jul 2012 20:16:28 GMT
Author: rhuijben
Date: Wed Jul  4 20:16:28 2012
New Revision: 1357388

URL: http://svn.apache.org/viewvc?rev=1357388&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_ACTUAL_TREE_CONFLICT,
   STMT_SELECT_ACTUAL_CHANGELIST): Remove unused statements.

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=1357388&r1=1357387&r2=1357388&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Wed Jul  4 20:16:28 2012
@@ -107,16 +107,6 @@ conflict_old, conflict_new, conflict_wor
 FROM actual_node
 WHERE wc_id = ?1 AND local_relpath = ?2
 
--- STMT_SELECT_ACTUAL_TREE_CONFLICT
-SELECT tree_conflict_data
-FROM actual_node
-WHERE wc_id = ?1 AND local_relpath = ?2 AND tree_conflict_data IS NOT NULL
-
--- STMT_SELECT_ACTUAL_CHANGELIST
-SELECT changelist
-FROM actual_node
-WHERE wc_id = ?1 AND local_relpath = ?2 AND changelist IS NOT NULL
-
 -- STMT_SELECT_NODE_CHILDREN_INFO
 /* Getting rows in an advantageous order using
      ORDER BY local_relpath, op_depth DESC
@@ -605,6 +595,7 @@ WHERE wc_id = ?1
 DELETE FROM actual_node
 WHERE wc_id = ?1 AND local_relpath = ?2
       AND tree_conflict_data IS NULL
+      AND conflict_data IS NULL
 
 -- STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST
 DELETE FROM actual_node



Mime
View raw message