subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1757761 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Thu, 25 Aug 2016 22:08:20 GMT
Author: ivan
Date: Thu Aug 25 22:08:19 2016
New Revision: 1757761

URL: http://svn.apache.org/viewvc?rev=1757761&view=rev
Log:
Simplify tree conflict resolution code a bit.

* subversion/libsvn_client/conflicts.c
  (resolve_update_incoming_added_file_replace): Pass NULL as FILE to
   svn_io_open_uniquely_named() -- in this case it will close temporary file
   automatically.

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=1757761&r1=1757760&r2=1757761&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Aug 25 22:08:19 2016
@@ -5402,7 +5402,6 @@ resolve_update_incoming_added_file_repla
   const char *lock_abspath;
   svn_client_ctx_t *ctx = conflict->ctx;
   svn_error_t *err;
-  apr_file_t *backup_file;
   const char *backup_path;
 
   option_id = svn_client_conflict_option_get_id(option);
@@ -5422,7 +5421,7 @@ resolve_update_incoming_added_file_repla
    * which means it does not exist in the repository. So it's a good idea 
    * to keep a backup, just in case someone picks this option by accident.
    * First, reserve a name in the filesystem. */
-  err = svn_io_open_uniquely_named(&backup_file, &backup_path,
+  err = svn_io_open_uniquely_named(NULL, &backup_path,
                                    svn_dirent_dirname(local_abspath,
                                                       scratch_pool), 
                                    svn_dirent_basename(local_abspath,
@@ -5433,13 +5432,9 @@ resolve_update_incoming_added_file_repla
   if (err)
     goto unlock_wc;
 
-  /* Close and remove the file. We're going to move the conflict victim
-   * on top and, at least on Windows, open files can't be replaced.
+  /* Remove the file. We're going to move the conflict victim on top and, at
+   * least on Windows, open files can't be replaced.
    * The WC is locked so anything racing us here is external to SVN. */ 
-  err = svn_io_file_close(backup_file, scratch_pool);
-  if (err)
-    goto unlock_wc;
-
   err = svn_error_compose_create(err, svn_io_remove_file2(backup_path, TRUE,
                                                           scratch_pool));
   if (err)



Mime
View raw message