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

[st...@apache.org]

Author: stsp
Date: Mon Apr 18 11:09:34 2016
New Revision: 1739742

URL: http://svn.apache.org/viewvc?rev=1739742&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_t): Add 'tree_conflict_get_local_details_func' and
   'tree_conflict_local_details'. These will be used to fetch details about
   local changes from the repository, which aplies to cases where local
   changes happened in the history of a merge target branch.
  (svn_client_conflict_tree_get_details): Fetch details for local changes
   if the conflict can do so.

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=1739742&r1=1739741&r2=1739742&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Apr 18 11:09:34 2016
@@ -86,10 +86,12 @@ 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_incoming_details_func;
+  tree_conflict_get_details_func_t tree_conflict_get_local_details_func;
 
   /* Any additional information found can be stored here and may be used
    * when describing a tree conflict. */
   void *tree_conflict_incoming_details;
+  void *tree_conflict_local_details;
 
   /* The pool this conflict was allocated from. */
   apr_pool_t *pool;
@@ -3952,6 +3954,10 @@ svn_client_conflict_tree_get_details(svn
     SVN_ERR(conflict->tree_conflict_get_incoming_details_func(conflict,
                                                               scratch_pool));
 
+  if (conflict->tree_conflict_get_local_details_func)
+    SVN_ERR(conflict->tree_conflict_get_local_details_func(conflict,
+                                                           scratch_pool));
+
   return SVN_NO_ERROR;
 }