You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by gs...@apache.org on 2010/03/31 03:54:58 UTC

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

Author: gstein
Date: Wed Mar 31 01:54:57 2010
New Revision: 929360

URL: http://svn.apache.org/viewvc?rev=929360&view=rev
Log:
Followup to r929353 with the missing wc-queries.sql.

* subversion/libsvn_wc/wc-queries.sql:
  (STMT_UPDATE_COPYFROM_TO_INHERIT): new statement to clear the copyfrom_*
    columns.

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=929360&r1=929359&r2=929360&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Wed Mar 31 01:54:57 2010
@@ -355,10 +355,18 @@ SELECT wc_id, local_relpath, parent_relp
     repos_relpath, revnum FROM BASE_NODE
 WHERE wc_id = ?1 AND local_relpath = ?2;
 
+-- ### the statement below should be setting copyfrom_revision!
 -- STMT_UPDATE_COPYFROM
 UPDATE WORKING_NODE set copyfrom_repos_id = ?3, copyfrom_repos_path = ?4
 WHERE wc_id = ?1 AND local_relpath = ?2;
 
+-- STMT_UPDATE_COPYFROM_TO_INHERIT
+UPDATE WORKING_NODE SET
+  copyfrom_repos_id = null,
+  copyfrom_repos_path = null,
+  copyfrom_revnum = null
+WHERE wc_id = ?1 AND local_relpath = ?2;
+
 -- STMT_DETERMINE_TREE_FOR_RECORDING
 SELECT 0 FROM BASE_NODE WHERE wc_id = ?1 AND local_relpath = ?2
 UNION