Author: ehu
Date: Sun Sep 5 20:57:26 2010
New Revision: 992893
URL: http://svn.apache.org/viewvc?rev=992893&view=rev
Log:
Fix conditional NODE_DATA section.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_temp_set_parent_stub_to_normal): Convert NODE_DATA
conditional section to SVN_WC__NODE_DATA.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=992893&r1=992892&r2=992893&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sun Sep 5 20:57:26 2010
@@ -9764,7 +9764,7 @@ svn_wc__db_temp_set_parent_stub_to_norma
SVN_ERR(svn_sqlite__bindf(stmt, "is", pdh->wcroot->wc_id, base));
SVN_ERR(svn_sqlite__step_done(stmt));
-#ifdef NODE_DATA
+#ifdef SVN_WC__NODE_DATA
SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
STMT_DELETE_NODE_DATA_WORKING));
SVN_ERR(svn_sqlite__bindf(stmt, "is", pdh->wcroot->wc_id, base));
@@ -9772,23 +9772,22 @@ svn_wc__db_temp_set_parent_stub_to_norma
#endif
}
- SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
- STMT_UPDATE_BASE_PRESENCE_KIND));
- SVN_ERR(svn_sqlite__bindf(stmt, "istt", pdh->wcroot->wc_id, base,
- presence_map, svn_wc__db_status_normal,
- kind_map, svn_wc__db_kind_subdir));
-#ifdef NODE_DATA
- /* When activating this bit, I get test failures;
- working copies seem to get disconnected from their parents...
- Need to investigate */
+#ifdef SVN_WC__NODE_DATA
SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
STMT_UPDATE_NODE_BASE_PRESENCE_KIND));
SVN_ERR(svn_sqlite__bindf(stmt, "istt", pdh->wcroot->wc_id, base,
presence_map, svn_wc__db_status_normal,
kind_map, svn_wc__db_kind_subdir));
+
+ SVN_ERR(svn_sqlite__update(&affected_rows, stmt));
#endif
+ SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
+ STMT_UPDATE_BASE_PRESENCE_KIND));
+ SVN_ERR(svn_sqlite__bindf(stmt, "istt", pdh->wcroot->wc_id, base,
+ presence_map, svn_wc__db_status_normal,
+ kind_map, svn_wc__db_kind_subdir));
SVN_ERR(svn_sqlite__update(&affected_rows, stmt));
if (affected_rows == 0)
