svn commit: r1004724 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

[ph...@apache.org]

Author: philip
Date: Tue Oct  5 17:23:35 2010
New Revision: 1004724

URL: http://svn.apache.org/viewvc?rev=1004724&view=rev
Log:
Copy properties from BASE_NODE to WORKING_NODE when inserting a
working node.  This is currently only used for presence=base-deleted
which doesn't really need properties in WORKING_NODE, but doing this
matches the NODES behaviour.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_INSERT_WORKING_NODE_FROM_BASE_NODE): Copy properties.

* subversion/libsvn_wc/wc_db.c
  (assert_working_rows_match,
   svn_wc__db_read_pristine_props): Enable properties comparison.

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=1004724&r1=1004723&r2=1004724&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Tue Oct  5 17:23:35 2010
@@ -571,10 +571,10 @@ VALUES (?1, ?2, 0,
 INSERT INTO working_node (
     wc_id, local_relpath, parent_relpath, presence, kind, checksum,
     translated_size, changed_rev, changed_date, changed_author, depth,
-    symlink_target, last_mod_time )
+    symlink_target, last_mod_time, properties )
 SELECT wc_id, local_relpath, parent_relpath, ?3 AS presence, kind, checksum,
     translated_size, changed_rev, changed_date, changed_author, depth,
-    symlink_target, last_mod_time
+    symlink_target, last_mod_time, properties
 FROM base_node
 WHERE wc_id = ?1 AND local_relpath = ?2;
 

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1004724&r1=1004723&r2=1004724&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Oct  5 17:23:35 2010
@@ -554,10 +554,7 @@ assert_working_rows_match(svn_boolean_t 
   SVN_ERR_ASSERT(svn_sqlite__column_int64(stmt1, 14)
                  == svn_sqlite__column_int64(stmt2, 14));
   /* properties */
-#if 0
-  /* Disabled for now as base-deleted don't match */
   SVN_ERR(assert_blob_columns_equal(stmt1, stmt2, 15, scratch_pool));
-#endif
 
   return SVN_NO_ERROR;
 }
@@ -5464,10 +5461,7 @@ svn_wc__db_read_pristine_props(apr_hash_
 
 #ifndef SVN_WC__NODES_ONLY
   SVN_ERR_ASSERT(have_row == have_node_row);
-#if 0
-  /* Disabled for now as base-deleted don't match */
   SVN_ERR(assert_blob_columns_equal(stmt, stmt_node, 0, scratch_pool));
-#endif
   SVN_ERR(svn_sqlite__reset(stmt_node));
 #else
   stmt = stmt_node;