subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1589720 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Thu, 24 Apr 2014 13:25:45 GMT
Author: stsp
Date: Thu Apr 24 13:25:45 2014
New Revision: 1589720

URL: http://svn.apache.org/r1589720
Log:
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Replace the other caller of launch_resolver()
   with a direct call to svn_cl__merge_file_externally().
   No functional change.

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=1589720&r1=1589719&r2=1589720&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Apr 24 13:25:45 2014
@@ -905,7 +905,12 @@ handle_text_conflict(svn_wc_conflict_res
               char buf[1024];
               const char *message;
 
-              err = launch_resolver(&performed_edit, desc, b, iterpool);
+              err = svn_cl__merge_file_externally(desc->base_abspath,
+                                                  desc->their_abspath,
+                                                  desc->my_abspath,
+                                                  desc->merged_file,
+                                                  desc->local_abspath,
+                                                  b->config, NULL, iterpool);
               if (err && (err->apr_err == SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL ||
                           err->apr_err == SVN_ERR_EXTERNAL_PROGRAM))
                 {
@@ -916,6 +921,8 @@ handle_text_conflict(svn_wc_conflict_res
                 }
               else if (err)
                 return svn_error_trace(err);
+              else
+                performed_edit = TRUE;
 
               if (performed_edit)
                 knows_something = TRUE;



Mime
View raw message