subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1100351 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c
Date Fri, 06 May 2011 20:03:40 GMT
Author: rhuijben
Date: Fri May  6 20:03:40 2011
New Revision: 1100351

URL: http://svn.apache.org/viewvc?rev=1100351&view=rev
Log:
Following up on r1100338 some small correctness tweaks.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_INSERT_WORKING_NODE_FROM_NODE_RECURSIVE): Rename to ...
  (STMT_INSERT_DELETE_FROM_NODE_RECURSIVE): ... this. Don't add deletes over
    excluded and absent nodes. Stop copying fields that are supposed to be
    NULL for deleted nodes.

* subversion/libsvn_wc/wc_db.c
  (op_delete_txn): Update caller. Update comments to reflect r1100338 changes.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1100351&r1=1100350&r2=1100351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri May  6 20:03:40 2011
@@ -699,18 +699,14 @@ SELECT wc_id, local_relpath, ?3 /*op_dep
 FROM nodes
 WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0
 
--- STMT_INSERT_WORKING_NODE_FROM_NODE_RECURSIVE
+-- STMT_INSERT_DELETE_FROM_NODE_RECURSIVE
 INSERT INTO nodes (
-    wc_id, local_relpath, op_depth, parent_relpath, presence, kind, checksum,
-    changed_revision, changed_date, changed_author, depth, symlink_target,
-    translated_size, last_mod_time, properties)
+    wc_id, local_relpath, op_depth, parent_relpath, presence, kind)
 SELECT wc_id, local_relpath, ?4 /*op_depth*/, parent_relpath, 'base-deleted',
-       kind, checksum, changed_revision, changed_date, changed_author, depth,
-       symlink_target, translated_size, last_mod_time, properties
+       kind
 FROM nodes_current
 WHERE wc_id = ?1 AND (local_relpath = ?2 OR local_relpath LIKE ?3 ESCAPE '#')
-  AND presence NOT IN ('base-deleted', 'not-present')
-      
+  AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
 
 -- STMT_INSERT_WORKING_NODE_FROM_BASE_COPY
 INSERT INTO nodes (

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1100351&r1=1100350&r2=1100351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri May  6 20:03:40 2011
@@ -5217,11 +5217,9 @@ op_delete_txn(void *baton,
                             wcroot->wc_id, local_relpath, like_arg,
                             b->delete_depth));
   SVN_ERR(svn_sqlite__step_done(stmt));
-    
-  /* Delete ACTUAL_NODE rows, but leave those that have tree conflicts
-     and those that have changelist and a NODES row.
-     
-     ### I don't know why we leave tree conflicts. */
+
+  /* Delete ACTUAL_NODE rows, but leave those that have changelist 
+     and a NODES row. */
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
                          STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE));
   SVN_ERR(svn_sqlite__bindf(stmt, "iss",
@@ -5243,7 +5241,7 @@ op_delete_txn(void *baton,
   if (add_work)
     {
       SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
-                                 STMT_INSERT_WORKING_NODE_FROM_NODE_RECURSIVE));
+                                 STMT_INSERT_DELETE_FROM_NODE_RECURSIVE));
       SVN_ERR(svn_sqlite__bindf(stmt, "issi",
                                 wcroot->wc_id, local_relpath, like_arg,
                                 b->delete_depth));



Mime
View raw message