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

[st...@apache.org]

Author: stsp
Date: Fri Feb 19 12:00:25 2016
New Revision: 1731232

URL: http://svn.apache.org/viewvc?rev=1731232&view=rev
Log:
Follow-up to r1731231:

* subversion/libsvn_client/resolved.c
  (resolve_tree_conflict): Fix condition which checks if a local move vs
   incoming edit conflict is resolved to the current working copy state.

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=1731232&r1=1731231&r2=1731232&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Feb 19 12:00:25 2016
@@ -864,10 +864,10 @@ resolve_tree_conflict(svn_client_conflic
     }
   else if ((operation == svn_wc_operation_update ||
             operation == svn_wc_operation_switch) &&
-            local_change == svn_client_conflict_option_merged_text &&
+            local_change == svn_wc_conflict_reason_moved_away &&
            incoming_change == svn_wc_conflict_action_edit &&
            option_id ==
-             svn_client_conflict_option_working_text_where_conflicted)
+             svn_client_conflict_option_merged_text)
     {
       /* We must break the move if the user accepts the current
        * working copy state instead of updating the move.