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

[st...@apache.org]

Author: stsp
Date: Mon Jun 13 11:59:12 2016
New Revision: 1748185

URL: http://svn.apache.org/viewvc?rev=1748185&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_incoming_move_file_text_merge): Acquire working copy write lock
   which is guaranteed to cover both sides of the incoming move.

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=1748185&r1=1748184&r2=1748185&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Jun 13 11:59:12 2016
@@ -5662,9 +5662,12 @@ resolve_incoming_move_file_text_merge(sv
   SVN_ERR(svn_io_file_flush(ancestor_file, scratch_pool));
 
   /* ### The following WC modifications should be atomic. */
-  SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx,
-                                                 local_abspath,
-                                                 scratch_pool, scratch_pool));
+  SVN_ERR(svn_wc__acquire_write_lock_for_resolve(
+            &lock_abspath, ctx->wc_ctx,
+            svn_dirent_get_longest_ancestor(local_abspath,
+                                            details->moved_to_abspath,
+                                            scratch_pool),
+            scratch_pool, scratch_pool));
 
   err = verify_local_state_for_incoming_delete(conflict, option, scratch_pool);
   if (err)