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

[st...@apache.org]

Author: stsp
Date: Thu Feb 25 12:34:33 2016
New Revision: 1732293

URL: http://svn.apache.org/viewvc?rev=1732293&view=rev
Log:
Fix a bug where a conflict resolution option was offered under circumstances
it cannot handle.

Problem exposed by move_tests.py failures.

* subversion/libsvn_clients/conflicts.c
  (svn_client_conflict_tree_get_resolution_options): The option to update
   moved-away nodes can only be used if the incoming change is 'edit'.

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=1732293&r1=1732292&r2=1732293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Feb 25 12:34:33 2016
@@ -1454,7 +1454,8 @@ svn_client_conflict_tree_get_resolution_
       svn_wc_conflict_reason_t reason;
 
       reason = svn_client_conflict_get_local_change(conflict);
-      if (reason == svn_wc_conflict_reason_moved_away)
+      if (reason == svn_wc_conflict_reason_moved_away &&
+          incoming_change == svn_wc_conflict_action_edit)
         {
           option = apr_pcalloc(result_pool, sizeof(*option));
           option->id =