subversion-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1757841&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (merge_incoming_added_file_replace): Do not use CTX->CANCEL_BATON as
   CANCEL_FUNC in call to 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=1757841&r1=1757840&r2=1757841&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Aug 26 13:14:42 2016
@@ -5198,7 +5198,7 @@ merge_incoming_added_file_replace(svn_cl
   SVN_ERR(svn_stream_open_readonly(&working_file_stream, local_abspath,
                                    scratch_pool, scratch_pool));
   SVN_ERR(svn_stream_copy3(working_file_stream, working_file_tmp_stream,
-                           ctx->cancel_baton, ctx->cancel_baton,
+                           ctx->cancel_func, ctx->cancel_baton,
                            scratch_pool));
   SVN_ERR(svn_io_file_flush(working_file_tmp, scratch_pool));
 



Mime
View raw message