You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by hw...@apache.org on 2010/10/29 21:31:20 UTC

svn commit: r1028883 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: hwright
Date: Fri Oct 29 19:31:20 2010
New Revision: 1028883

URL: http://svn.apache.org/viewvc?rev=1028883&view=rev
Log:
Fix a pool lifetime issue for TREE_CONFLICTS_ON_CHILDREN.  The number of
failing tests is now 25.

* subversion/libsvn_wc/wc_db.c
  (read_all_tree_conflicts): Allocate results in result pool.

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=1028883&r1=1028882&r2=1028883&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Oct 29 19:31:20 2010
@@ -4279,7 +4279,7 @@ read_all_tree_conflicts(apr_hash_t **tre
 
       conflict_data = svn_sqlite__column_text(stmt, 1, NULL);
       SVN_ERR(svn_wc__read_tree_conflicts(&conflict_hash, conflict_data,
-                                          pdh->wcroot->abspath, iterpool));
+                                          pdh->wcroot->abspath, result_pool));
 
       *tree_conflicts = apr_hash_overlay(result_pool, conflict_hash,
                                          *tree_conflicts);