svn commit: r1757881 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[iv...@apache.org]

Author: ivan
Date: Fri Aug 26 15:20:03 2016
New Revision: 1757881

URL: http://svn.apache.org/viewvc?rev=1757881&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_text_merge): Pass NULL as FILE argument
   to svn_io_open_unique_file3() to close empty file.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1757881&r1=1757880&r2=1757881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Aug 26 15:20:03 2016
@@ -5033,7 +5033,6 @@ resolve_merge_incoming_added_file_text_m
   svn_wc_notify_state_t merge_props_outcome;
   apr_file_t *incoming_new_file;
   const char *incoming_new_tmp_abspath;
-  apr_file_t *empty_file;
   const char *empty_file_abspath;
   svn_stream_t *incoming_new_stream;
   apr_hash_t *incoming_new_props;
@@ -5088,7 +5087,7 @@ resolve_merge_incoming_added_file_text_m
 
   /* Create an empty file as fake "merge-base" for the two added files.
    * The files are not ancestrally related so this is the best we can do. */
-  SVN_ERR(svn_io_open_unique_file3(&empty_file, &empty_file_abspath, NULL,
+  SVN_ERR(svn_io_open_unique_file3(NULL, &empty_file_abspath, NULL,
                                    svn_io_file_del_on_pool_cleanup,
                                    scratch_pool, scratch_pool));