subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1687423 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Thu, 25 Jun 2015 08:03:46 GMT
Author: stsp
Date: Thu Jun 25 08:03:46 2015
New Revision: 1687423

URL: http://svn.apache.org/r1687423
Log:
* subversion/svn/conflict-callbacks.c
  (show_diff): Add a merged_file argument and stop pulling the merged file
   path out of the conflict descriptor.
  (handle_text_conflict): Pass the merged file path to show_diff() explicitly.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1687423&r1=1687422&r2=1687423&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jun 25 08:03:46 2015
@@ -131,6 +131,7 @@ svn_cl__accept_from_word(const char *wor
  * corresponding to the conflict described in DESC. */
 static svn_error_t *
 show_diff(const svn_wc_conflict_description2_t *desc,
+          const char *merged_file,
           const char *path_prefix,
           svn_cancel_func_t cancel_func,
           void *cancel_baton,
@@ -143,12 +144,10 @@ show_diff(const svn_wc_conflict_descript
   svn_diff_file_options_t *options;
   const char *my_abspath;
   const char *their_abspath;
-  const char *merged_file;
 
   SVN_ERR(svn_client_conflict_text_get_contents(NULL, &my_abspath, NULL,
                                                 &their_abspath,
                                                 desc, pool, pool));
-  merged_file = svn_client_conflict_get_merged_file(desc);
   if (merged_file)
     {
       /* For conflicts recorded by the 'merge' operation, show a diff between
@@ -868,7 +867,7 @@ handle_text_conflict(svn_wc_conflict_res
               continue;
             }
 
-          SVN_ERR(show_diff(desc, b->path_prefix,
+          SVN_ERR(show_diff(desc, merged_file, b->path_prefix,
                             b->pb->cancel_func, b->pb->cancel_baton,
                             iterpool));
           knows_something = TRUE;



Mime
View raw message