svn commit: r940982 - /subversion/trunk/subversion/libsvn_wc/util.c

[da...@apache.org]

Author: dannas
Date: Tue May  4 17:41:24 2010
New Revision: 940982

URL: http://svn.apache.org/viewvc?rev=940982&view=rev
Log:
Fix wrongly choosen pools.

* subversion/libsvn_wc/util.c
  (svn_wc__status2_from_3): Use result_pool for the things that should 
    be returned and scratch_pool for the rest. Plain and simple.

Suggested by: gstein

Modified:
    subversion/trunk/subversion/libsvn_wc/util.c

Modified: subversion/trunk/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/util.c?rev=940982&r1=940981&r2=940982&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Tue May  4 17:41:24 2010
@@ -569,9 +569,9 @@ svn_wc__status2_from_3(svn_wc_status2_t 
                             scratch_pool));
 
   SVN_ERR(svn_wc__db_op_read_tree_conflict(&tree_conflict, wc_ctx->db,
-                                           local_abspath, result_pool,
+                                           local_abspath, scratch_pool,
                                            scratch_pool));
-  old_tree_conflict = svn_wc__cd2_to_cd(tree_conflict, scratch_pool);
+  old_tree_conflict = svn_wc__cd2_to_cd(tree_conflict, result_pool);
 
   (*status)->entry = entry;
   (*status)->text_status = old_status->text_status;