subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kot...@apache.org
Subject svn commit: r1763596 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Thu, 06 Oct 2016 14:44:38 GMT
Author: kotkov
Date: Thu Oct  6 14:44:38 2016
New Revision: 1763596

URL: http://svn.apache.org/viewvc?rev=1763596&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (edit_prop_conflict): Use a scratch pool when creating a temporary
   file with the merged property values.  We don't need this file to
   live after this function returns, because we read the final (edited)
   value into memory.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1763596&r1=1763595&r2=1763596&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Oct  6 14:44:38 2016
@@ -345,7 +345,7 @@ edit_prop_conflict(const svn_string_t **
 
   SVN_ERR(svn_io_open_unique_file3(&file, &file_path, NULL,
                                    svn_io_file_del_on_pool_cleanup,
-                                   result_pool, scratch_pool));
+                                   scratch_pool, scratch_pool));
   merged_prop = svn_stream_from_aprfile2(file, TRUE /* disown */,
                                          scratch_pool);
   SVN_ERR(merge_prop_conflict(merged_prop, base_propval, my_propval,



Mime
View raw message