Author: julianfoad
Date: Tue Apr 30 21:38:58 2013
New Revision: 1477843
URL: http://svn.apache.org/r1477843
Log:
* subversion/libsvn_wc/conflicts.c
(svn_wc__conflict_invoke_resolver): Destroy the iterpool after use, to
conform to our normal pattern.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1477843&r1=1477842&r2=1477843&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Apr 30 21:38:58 2013
@@ -1966,6 +1966,7 @@ svn_wc__conflict_invoke_resolver(svn_wc_
SVN_ERR(svn_wc__mark_resolved_prop_conflicts(db, local_abspath,
scratch_pool));
}
+ svn_pool_destroy(iterpool);
}
if (text_conflicted)
