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

Posted to commits@subversion.apache.org by ph...@apache.org on 2013/05/13 13:48:35 UTC

svn commit: r1481800 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

Author: philip
Date: Mon May 13 11:48:34 2013
New Revision: 1481800

URL: http://svn.apache.org/r1481800
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__read_conflicts): Elements of the locations array become part
   of the returned array so allocate in result_pool.

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=1481800&r1=1481799&r2=1481800&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon May 13 11:48:34 2013
@@ -2298,7 +2298,7 @@ svn_wc__read_conflicts(const apr_array_h
   SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, &text_conflicted,
                                      &prop_conflicted, &tree_conflicted,
                                      db, local_abspath, conflict_skel,
-                                     scratch_pool, scratch_pool));
+                                     result_pool, scratch_pool));
 
   cflcts = apr_array_make(result_pool, 4,
                           sizeof(svn_wc_conflict_description2_t*));