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

[st...@apache.org]

Author: stsp
Date: Wed Feb 24 13:13:55 2016
New Revision: 1732144

URL: http://svn.apache.org/viewvc?rev=1732144&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_get_incoming_change): Restrict special description and
   details for 'incoming delete' conflicts to the update operation for now.
   The implementation doesn't handle switch/merge at present.

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=1732144&r1=1732143&r2=1732144&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Feb 24 13:13:55 2016
@@ -245,7 +245,8 @@ conflict_type_specific_setup(svn_client_
   incoming_change = svn_client_conflict_get_incoming_change(conflict);
 
   /* Set type-specific description and details functions if available. */
-  if (incoming_change == svn_wc_conflict_action_delete)
+  if (incoming_change == svn_wc_conflict_action_delete &&
+      operation == svn_wc_operation_update /* ### TODO: merge/switch */)
     {
       conflict->tree_conflict_get_description_func =
         conflict_tree_get_description_incoming_delete;