subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1731226 - /subversion/trunk/subversion/libsvn_client/resolved.c
Date Fri, 19 Feb 2016 11:47:20 GMT
Author: stsp
Date: Fri Feb 19 11:47:20 2016
New Revision: 1731226

URL: http://svn.apache.org/viewvc?rev=1731226&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (resolve_tree_conflict): Only break moves if incoming change is 'replace'
   rather than 'delete'. Matches the behaviour of old resolver more closely.

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=1731226&r1=1731225&r2=1731226&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Feb 19 11:47:20 2016
@@ -818,13 +818,18 @@ resolve_tree_conflict(svn_client_conflic
        local_change == svn_wc_conflict_reason_replaced) &&
       option_id == svn_client_conflict_option_merged_text)
     {
-      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);
+      if (incoming_change != svn_wc_conflict_action_delete)
+        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
+        {
+          /* # The move is/moves are already broken */
+        }
     }
   else if ((operation == svn_wc_operation_update ||
             operation == svn_wc_operation_switch) &&



Mime
View raw message