You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2011/09/08 04:19:54 UTC

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

Author: neels
Date: Thu Sep  8 02:19:54 2011
New Revision: 1166500

URL: http://svn.apache.org/viewvc?rev=1166500&view=rev
Log:
Follow-up to issue #4000. When WC->WC copying dirs with file externals, don't
create incomplete nodes in the copy target at the paths corresponding to
checked out file externals in the copy source.

* subversion/libsvn_wc/wc-queries.sql:
  (STMT_SELECT_OP_DEPTH_CHILDREN): Don't select file externals.

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=1166500&r1=1166499&r2=1166500&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Sep  8 02:19:54 2011
@@ -169,6 +169,7 @@ VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, 
 -- STMT_SELECT_OP_DEPTH_CHILDREN
 SELECT local_relpath FROM nodes
 WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth = ?3
+  AND (?3 != 0 OR file_external is NULL)
 
 -- STMT_SELECT_GE_OP_DEPTH_CHILDREN
 SELECT 1 FROM nodes