svn commit: r1589718 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Thu Apr 24 13:19:49 2014
New Revision: 1589718

URL: http://svn.apache.org/r1589718
Log:
* subversion/svn/cl-conflicts.c
  (handle_text_conflict): Replace one caller of launch_resolver()
   with a direct call to svn_cl__merge_file_externally(). Also take
   into account the 'remains_in_conflict' flag which is set if the
   external merge too exists with exit code 1. Previously this flag
   was ignored since launch_resolver() ignores it.

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=1589718&r1=1589717&r2=1589718&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Apr 24 13:19:49 2014
@@ -830,7 +830,10 @@ handle_text_conflict(svn_wc_conflict_res
           svn_boolean_t remains_in_conflict = TRUE;
           svn_error_t *err;
 
-          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,
+                                              &remains_in_conflict, iterpool);
           if (err)
             {
               if (err->apr_err == SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL)
@@ -852,6 +855,8 @@ handle_text_conflict(svn_wc_conflict_res
               else
                 return svn_error_trace(err);
             }
+          else
+            performed_edit = TRUE;
 
           if (!performed_edit &&
               desc->base_abspath && desc->their_abspath &&