svn commit: r1731231 - /subversion/trunk/subversion/libsvn_client/resolved.c

[stsp]

Author: stsp
Date: Fri Feb 19 11:56:28 2016
New Revision: 1731231

URL: http://svn.apache.org/viewvc?rev=1731231&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (resolve_tree_conflict): If a local move vs incoming edit conflict is
   resolved to the current working copy state, then break the move.
   Matches old conflict resolver behaviour.

Modified:
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1731231&r1=1731230&r2=1731231&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Feb 19 11:56:28 
2016
@@ -862,6 +862,24 @@ resolve_tree_conflict(svn_client_conflic
                                                          ctx->notify_baton2,
                                                          scratch_pool);
     }
+  else if ((operation == svn_wc_operation_update ||
+            operation == svn_wc_operation_switch) &&
+            local_change == svn_client_conflict_option_merged_text &&
+           incoming_change == svn_wc_conflict_action_edit &&
+           option_id ==
+             svn_client_conflict_option_working_text_where_conflicted)
+    {
+      /* We must break the move if the user accepts the current
+       * working copy state instead of updating the move.
+       * Else the move would be left in an invalid state. */
+      err = svn_wc__conflict_tree_update_break_moved_away(ctx->wc_ctx,
+                                                          local_abspath,
+                                                          ctx->cancel_func,
+                                                          ctx->cancel_baton,
+                                                          ctx->notify_func2,
+                                                          ctx->notify_baton2,
+                                                          scratch_pool);
+    }
   else
     {
       svn_wc_conflict_choice_t conflict_choice;