subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1739741 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Mon, 18 Apr 2016 11:03:14 GMT
Author: stsp
Date: Mon Apr 18 11:03:14 2016
New Revision: 1739741

URL: http://svn.apache.org/viewvc?rev=1739741&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_t): Rename 'tree_conflict_get_details_func' field to
   'tree_conflict_get_incoming_details_func'. This function fetches details
   for incoming changes only.
  (svn_client_conflict_tree_get_details,
   conflict_type_specific_setup): Update users of this field.

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=1739741&r1=1739740&r2=1739741&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Apr 18 11:03:14 2016
@@ -85,7 +85,7 @@ struct svn_client_conflict_t
 
   /* Ask a tree conflict to find out more information about itself
    * by contacting the repository. */
-  tree_conflict_get_details_func_t tree_conflict_get_details_func;
+  tree_conflict_get_details_func_t tree_conflict_get_incoming_details_func;
 
   /* Any additional information found can be stored here and may be used
    * when describing a tree conflict. */
@@ -3948,8 +3948,9 @@ svn_client_conflict_tree_get_details(svn
 {
   SVN_ERR(assert_tree_conflict(conflict, scratch_pool));
 
-  if (conflict->tree_conflict_get_details_func)
-    SVN_ERR(conflict->tree_conflict_get_details_func(conflict, scratch_pool));
+  if (conflict->tree_conflict_get_incoming_details_func)
+    SVN_ERR(conflict->tree_conflict_get_incoming_details_func(conflict,
+                                                              scratch_pool));
 
   return SVN_NO_ERROR;
 }
@@ -4486,21 +4487,21 @@ conflict_type_specific_setup(svn_client_
     {
       conflict->tree_conflict_get_description_func =
         conflict_tree_get_description_incoming_delete;
-      conflict->tree_conflict_get_details_func =
+      conflict->tree_conflict_get_incoming_details_func =
         conflict_tree_get_details_incoming_delete;
     }
   else if (incoming_change == svn_wc_conflict_action_add)
     {
       conflict->tree_conflict_get_description_func =
         conflict_tree_get_description_incoming_add;
-      conflict->tree_conflict_get_details_func =
+      conflict->tree_conflict_get_incoming_details_func =
         conflict_tree_get_details_incoming_add;
     }
   else if (incoming_change == svn_wc_conflict_action_edit)
     {
       conflict->tree_conflict_get_description_func =
         conflict_tree_get_description_incoming_edit;
-      conflict->tree_conflict_get_details_func =
+      conflict->tree_conflict_get_incoming_details_func =
         conflict_tree_get_details_incoming_edit;
     }
 



Mime
View raw message