You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/06/02 01:45:19 UTC

svn commit: r1345392 - /subversion/trunk/subversion/libsvn_wc/wc-queries.sql

Author: rhuijben
Date: Fri Jun  1 23:45:18 2012
New Revision: 1345392

URL: http://svn.apache.org/viewvc?rev=1345392&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
  (STMT_INSERT_WORKING_NODE_COPY_FROM,
   STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH): Use the nodes table directly in
     the inner query, as we already know the op-depth and the reason we query
     is that we don't want to accidentally remove a moved_to marker.

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=1345392&r1=1345391&r2=1345392&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri Jun  1 23:45:18 2012
@@ -905,7 +905,7 @@ SELECT wc_id, ?3 /*local_relpath*/, ?4 /
     ?7/*moved_here*/, kind, changed_revision, changed_date,
     changed_author, checksum, properties, translated_size,
     last_mod_time, symlink_target,
-    (SELECT dst.moved_to FROM nodes_current AS dst
+    (SELECT dst.moved_to FROM nodes AS dst
                          WHERE dst.wc_id = ?1
                          AND dst.local_relpath = ?3
                          AND dst.op_depth = ?4)
@@ -923,7 +923,7 @@ SELECT wc_id, ?3 /*local_relpath*/, ?4 /
     ?7 /*moved_here*/, kind, changed_revision, changed_date,
     changed_author, checksum, properties, translated_size,
     last_mod_time, symlink_target,
-    (SELECT dst.moved_to FROM nodes_current AS dst
+    (SELECT dst.moved_to FROM nodes AS dst
                          WHERE dst.wc_id = ?1
                          AND dst.local_relpath = ?3
                          AND dst.op_depth = ?4)