subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1757857 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Fri, 26 Aug 2016 14:10:30 GMT
Author: ivan
Date: Fri Aug 26 14:10:30 2016
New Revision: 1757857

URL: http://svn.apache.org/viewvc?rev=1757857&view=rev
Log:
Do not perform svn_io_file_flush() on already closed file in conflict
resolution code.

The code could be simplified using svn_stream_open_unique(), but I'm going to
do this in separate commit.

* subversion/libsvn_client/conflicts.c
  (merge_incoming_added_file_replace): Do call svn_io_file_flush() because
   WORKING_FILE_TMP is already closed by svn_stream_copy3().

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=1757857&r1=1757856&r2=1757857&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Aug 26 14:10:30 2016
@@ -5200,7 +5200,6 @@ merge_incoming_added_file_replace(svn_cl
   SVN_ERR(svn_stream_copy3(working_file_stream, working_file_tmp_stream,
                            ctx->cancel_func, ctx->cancel_baton,
                            scratch_pool));
-  SVN_ERR(svn_io_file_flush(working_file_tmp, scratch_pool));
 
   /* Get a copy of the working file's properties. */
   SVN_ERR(svn_wc_prop_list2(&working_props, ctx->wc_ctx, local_abspath,



Mime
View raw message