You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/11/15 15:51:48 UTC
svn commit: r1035293 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: rhuijben
Date: Mon Nov 15 14:51:48 2010
New Revision: 1035293
URL: http://svn.apache.org/viewvc?rev=1035293&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(read_tree_conflict): Following up on r1035277, only reset the statement
after the skel is deserialized. This should fix many tests that started
failing after r1035277.
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=1035293&r1=1035292&r2=1035293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Nov 15 14:51:48 2010
@@ -4356,7 +4356,8 @@ read_tree_conflict(const svn_wc_conflict
svn_boolean_t have_row;
const char *conflict_data;
const svn_skel_t *skel;
-
+ svn_error_t *err;
+
*tree_conflict = NULL;
if (!local_relpath[0])
@@ -4372,12 +4373,12 @@ read_tree_conflict(const svn_wc_conflict
conflict_data = svn_sqlite__column_text(stmt, 0, NULL);
skel = svn_skel__parse(conflict_data, strlen(conflict_data), scratch_pool);
- SVN_ERR(svn_sqlite__reset(stmt));
- SVN_ERR(svn_wc__deserialize_conflict(tree_conflict, skel,
- pdh->wcroot->abspath, result_pool,
- scratch_pool));
+ err = svn_wc__deserialize_conflict(tree_conflict, skel,
+ pdh->wcroot->abspath, result_pool,
+ scratch_pool);
- return SVN_NO_ERROR;
+ return svn_error_compose_create(err,
+ svn_sqlite__reset(stmt));
}
svn_error_t *