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

[iv...@apache.org]

Author: ivan
Date: Thu Aug 25 22:17:54 2016
New Revision: 1757763

URL: http://svn.apache.org/viewvc?rev=1757763&view=rev
Log:
Avoid flushing changes to disk when resolving tree conflict: we do not use
flush to disk for working copy operations.

* subversion/libsvn_client/conflicts.c
  (resolve_update_incoming_added_file_replace): Pass FLUSH_TO_DISK=FALSE in
   call to svn_io_file_rename2().

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=1757763&r1=1757762&r2=1757763&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Aug 25 22:17:54 2016
@@ -5434,7 +5434,7 @@ resolve_update_incoming_added_file_repla
 
   /* Create a backup by renaming the file on top of the 'reserved' name.
    * Renaming is equally fast for big and small files. */
-  err = svn_io_file_rename2(local_abspath, backup_path, TRUE, scratch_pool);
+  err = svn_io_file_rename2(local_abspath, backup_path, FALSE, scratch_pool);
   if (err)
     goto unlock_wc;