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

[st...@apache.org]

Author: stsp
Date: Tue Apr 19 12:35:07 2016
New Revision: 1739922

URL: http://svn.apache.org/viewvc?rev=1739922&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_text_merge): Send file merge notification.

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=1739922&r1=1739921&r2=1739922&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Apr 19 12:35:07 2016
@@ -3711,17 +3711,24 @@ resolve_merge_incoming_added_file_text_m
     {
       svn_wc_notify_t *notify;
 
-      notify = svn_wc_create_notify(local_abspath, svn_wc_notify_resolved,
+      /* Tell the world about the file merge that just happened. */
+      notify = svn_wc_create_notify(local_abspath,
+                                    svn_wc_notify_update_update,
                                     scratch_pool);
-
-      /* Signal new text/prop merge conflicts */
       if (merge_content_outcome == svn_wc_merge_conflict)
         notify->content_state = svn_wc_notify_state_conflicted;
-      if (merge_props_outcome == svn_wc_notify_state_conflicted)
-        notify->prop_state = svn_wc_notify_state_conflicted;
+      else
+        notify->content_state = svn_wc_notify_state_merged;
+      notify->prop_state = merge_props_outcome;
+      notify->kind = svn_node_file;
+      ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
 
+      /* And also about the successfully resolved tree conflict. */
+      notify = svn_wc_create_notify(local_abspath, svn_wc_notify_resolved,
+                                    scratch_pool);
       ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
     }
+
   conflict->resolution_tree = svn_client_conflict_option_get_id(option);
 
   return SVN_NO_ERROR;