subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1739933 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Tue, 19 Apr 2016 14:14:01 GMT
Author: stsp
Date: Tue Apr 19 14:14:00 2016
New Revision: 1739933

URL: http://svn.apache.org/viewvc?rev=1739933&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_accept_current_wc_state,
   resolve_merge_incoming_added_file_text_merge): Send new notification
    action svn_wc_notify_resolved_tree instead of svn_wc_notify_resolved.

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=1739933&r1=1739932&r2=1739933&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Apr 19 14:14:00 2016
@@ -3479,7 +3479,7 @@ resolve_accept_current_wc_state(svn_clie
   if (ctx->notify_func2)
     ctx->notify_func2(ctx->notify_baton2,
                       svn_wc_create_notify(local_abspath,
-                                           svn_wc_notify_resolved,
+                                           svn_wc_notify_resolved_tree,
                                            scratch_pool),
                       scratch_pool);
 
@@ -3724,7 +3724,7 @@ resolve_merge_incoming_added_file_text_m
       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,
+      notify = svn_wc_create_notify(local_abspath, svn_wc_notify_resolved_tree,
                                     scratch_pool);
       ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
     }
@@ -3922,9 +3922,10 @@ unlock_wc:
 
   if (ctx->notify_func2)
     {
-      svn_wc_notify_t *notify = svn_wc_create_notify(local_abspath,
-                                                     svn_wc_notify_resolved,
-                                                     scratch_pool);
+      svn_wc_notify_t *notify = svn_wc_create_notify(
+                                  local_abspath,
+                                  svn_wc_notify_resolved_tree,
+                                  scratch_pool);
 
       ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
     }



Mime
View raw message