Author: philip
Date: Fri May 28 16:19:25 2010
New Revision: 949216
URL: http://svn.apache.org/viewvc?rev=949216&view=rev
Log:
Pass more regression tests with SVN_EXPERIMENTAL_COPY.
* subversion/libsvn_wc/wc-queries.sql
(STMT_INSERT_WORKING_NODE_COPY_FROM_BASE,
STMT_INSERT_WORKING_NODE_COPY_FROM_WORKING,
STMT_INSERT_ACTUAL_NODE_FROM_ACTUAL_NODE): Allow replacing.
* subversion/libsvn_wc/wc_db.c
(temp_cross_db_copy): Initialise work_items.
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=949216&r1=949215&r2=949216&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri May 28 16:19:25
2010
@@ -413,7 +413,7 @@ UNION
SELECT 1 FROM WORKING_NODE WHERE wc_id = ?1 AND local_relpath = ?2;
-- STMT_INSERT_WORKING_NODE_COPY_FROM_BASE
-INSERT INTO WORKING_NODE (
+INSERT OR REPLACE 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, properties, copyfrom_repos_id,
@@ -425,7 +425,7 @@ SELECT wc_id, ?3 AS local_relpath, ?4 AS
WHERE wc_id = ?1 AND local_relpath = ?2;
-- STMT_INSERT_WORKING_NODE_COPY_FROM_WORKING
-INSERT INTO WORKING_NODE (
+INSERT OR REPLACE 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, properties, copyfrom_repos_id,
@@ -437,7 +437,7 @@ SELECT wc_id, ?3 AS local_relpath, ?4 AS
WHERE wc_id = ?1 AND local_relpath = ?2;
-- STMT_INSERT_ACTUAL_NODE_FROM_ACTUAL_NODE
-INSERT INTO ACTUAL_NODE (
+INSERT OR REPLACE INTO ACTUAL_NODE (
wc_id, local_relpath, parent_relpath, properties,
conflict_old, conflict_new, conflict_working,
prop_reject, changelist, text_mod, tree_conflict_data )
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=949216&r1=949215&r2=949216&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri May 28 16:19:25 2010
@@ -2244,6 +2244,8 @@ temp_cross_db_copy(svn_wc__db_t *db,
iwb.checksum = checksum;
+ iwb.work_items = NULL;
+
SVN_ERR(insert_working_node(&iwb, dst_pdh->wcroot->sdb, scratch_pool));
/* ### What about actual_node? */
