Author: hwright
Date: Tue May 3 17:22:56 2011
New Revision: 1099135
URL: http://svn.apache.org/viewvc?rev=1099135&view=rev
Log:
* subversion/libsvn_wc/tree_conflicts.c
(svn_wc__get_tree_conflict): Alloc result in result_pool.
Modified:
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1099135&r1=1099134&r2=1099135&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Tue May 3 17:22:56
2011
@@ -425,7 +425,7 @@ svn_wc__get_tree_conflict(const svn_wc_c
return svn_error_return(
svn_wc__db_op_read_tree_conflict(tree_conflict, wc_ctx->db, victim_abspath,
- scratch_pool, scratch_pool));
+ result_pool, scratch_pool));
}
svn_error_t *
