subversion-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1739753&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (tree_conflict_get_local_description_generic,
   tree_conflict_get_incoming_description_generic): Rename to ...
  (conflict_tree_get_local_description_generic,
   conflict_tree_get_incoming_description_generic): ... this, for consistency
    with the names of similar functions.
  (conflict_tree_get_description_incoming_delete,
   conflict_tree_get_description_incoming_add,
   conflict_tree_get_description_incoming_edit,
   conflict_type_specific_setup): Track rename. 

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=1739753&r1=1739752&r2=1739753&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Apr 18 12:34:34 2016
@@ -998,7 +998,7 @@ describe_local_none_node_change(const ch
 
 /* Implements tree_conflict_get_description_func_t. */
 static svn_error_t *
-tree_conflict_get_local_description_generic(const char **description,
+conflict_tree_get_local_description_generic(const char **description,
                                             svn_client_conflict_t *conflict,
                                             apr_pool_t *result_pool,
                                             apr_pool_t *scratch_pool)
@@ -1041,7 +1041,7 @@ conflict_tree_get_description_local_miss
 
   details = conflict->tree_conflict_local_details;
   if (details == NULL)
-    return svn_error_trace(tree_conflict_get_local_description_generic(
+    return svn_error_trace(conflict_tree_get_local_description_generic(
                              description, conflict, result_pool, scratch_pool));
 
   *description = apr_psprintf(
@@ -1289,7 +1289,7 @@ svn_client_conflict_prop_get_description
 
 /* Implements tree_conflict_get_description_func_t. */
 static svn_error_t *
-tree_conflict_get_incoming_description_generic(
+conflict_tree_get_incoming_description_generic(
   const char **incoming_change_description,
   svn_client_conflict_t *conflict,
   apr_pool_t *result_pool,
@@ -1942,7 +1942,7 @@ conflict_tree_get_description_incoming_d
   struct conflict_tree_incoming_delete_details *details;
 
   if (conflict->tree_conflict_incoming_details == NULL)
-    return svn_error_trace(tree_conflict_get_incoming_description_generic(
+    return svn_error_trace(conflict_tree_get_incoming_description_generic(
                              incoming_change_description,
                              conflict, result_pool, scratch_pool));
 
@@ -2754,7 +2754,7 @@ conflict_tree_get_description_incoming_a
   struct conflict_tree_incoming_add_details *details;
 
   if (conflict->tree_conflict_incoming_details == NULL)
-    return svn_error_trace(tree_conflict_get_incoming_description_generic(
+    return svn_error_trace(conflict_tree_get_incoming_description_generic(
                              incoming_change_description,
                              conflict, result_pool, scratch_pool));
 
@@ -3164,7 +3164,7 @@ conflict_tree_get_description_incoming_e
   apr_array_header_t *edits;
 
   if (conflict->tree_conflict_incoming_details == NULL)
-    return svn_error_trace(tree_conflict_get_incoming_description_generic(
+    return svn_error_trace(conflict_tree_get_incoming_description_generic(
                              incoming_change_description,
                              conflict, result_pool, scratch_pool));
 
@@ -4486,9 +4486,9 @@ conflict_type_specific_setup(svn_client_
 
   /* Set a default description function. */
   conflict->tree_conflict_get_incoming_description_func =
-    tree_conflict_get_incoming_description_generic;
+    conflict_tree_get_incoming_description_generic;
   conflict->tree_conflict_get_local_description_func =
-    tree_conflict_get_local_description_generic;
+    conflict_tree_get_local_description_generic;
 
   incoming_change = svn_client_conflict_get_incoming_change(conflict);
   local_change = svn_client_conflict_get_local_change(conflict);



Mime
View raw message