You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/04/05 19:36:54 UTC
svn commit: r1089142 - in /subversion/trunk/subversion/libsvn_wc:
wc-queries.sql wc_db.c
Author: philip
Date: Tue Apr 5 17:36:54 2011
New Revision: 1089142
URL: http://svn.apache.org/viewvc?rev=1089142&view=rev
Log:
Match up the columns for cross-database actual-node copy.
* subversion/libsvn_wc/wc-queries.sql
(STMT_INSERT_ACTUAL_NODE): Hard code text_mod to NULL.
* subversion/libsvn_wc/wc_db.c
(cross_db_copy): Copy the property conflict value so that subsequent
values bind to the correct columns.
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=1089142&r1=1089141&r2=1089142&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Tue Apr 5 17:36:54 2011
@@ -788,7 +788,7 @@ INSERT OR REPLACE INTO actual_node (
conflict_new,
conflict_working, prop_reject, changelist, text_mod,
tree_conflict_data)
-VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11)
+VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, NULL, ?10)
-- STMT_SELECT_NOT_PRESENT
SELECT 1 FROM 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=1089142&r1=1089141&r2=1089142&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Apr 5 17:36:54 2011
@@ -2258,11 +2258,9 @@ cross_db_copy(svn_wc__db_wcroot_t *src_w
SVN_ERR(svn_sqlite__step(&have_row, stmt));
if (have_row)
{
- /* const char *prop_reject = svn_sqlite__column_text(stmt, 0,
- scratch_pool);
-
- ### STMT_INSERT_ACTUAL_NODE doesn't cover every column, it's
+ /* ### STMT_INSERT_ACTUAL_NODE doesn't cover every column, it's
### enough for some cases but will probably need to extended. */
+ const char *prop_reject = svn_sqlite__column_text(stmt, 0, scratch_pool);
const char *changelist = svn_sqlite__column_text(stmt, 1, scratch_pool);
const char *conflict_old = svn_sqlite__column_text(stmt, 2, scratch_pool);
const char *conflict_new = svn_sqlite__column_text(stmt, 3, scratch_pool);
@@ -2278,12 +2276,12 @@ cross_db_copy(svn_wc__db_wcroot_t *src_w
SVN_ERR(svn_sqlite__reset(stmt));
SVN_ERR(svn_sqlite__get_statement(&stmt, dst_wcroot->sdb,
STMT_INSERT_ACTUAL_NODE));
- SVN_ERR(svn_sqlite__bindf(stmt, "issbsssss",
+ SVN_ERR(svn_sqlite__bindf(stmt, "issbssssss",
dst_wcroot->wc_id, dst_relpath,
svn_relpath_dirname(dst_relpath, scratch_pool),
properties, props_size,
conflict_old, conflict_new, conflict_working,
- changelist, tree_conflict_data));
+ prop_reject, changelist, tree_conflict_data));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
}
SVN_ERR(svn_sqlite__reset(stmt));