RE: svn commit: r1687456 - in /subversion/trunk/subversion:include/svn_client.h svn/conflict-callbacks.c

[Bert Huijben <be...@qqmail.nl>]

Does this simplification properly handle binary files that can't be automatically merged? (Hard to tell by looking at these patches from my phone :-))

Bert

-----Original Message-----
From: "stsp@apache.org" <st...@apache.org>
Sent: ‎25-‎6-‎2015 11:20
To: "commits@subversion.apache.org" <co...@subversion.apache.org>
Subject: svn commit: r1687456 - in /subversion/trunk/subversion:include/svn_client.h svn/conflict-callbacks.c

Author: stsp
Date: Thu Jun 25 09:20:54 2015
New Revision: 1687456

URL: http://svn.apache.org/r1687456
Log:
Remove the svn_client_conflict_get_merged_file() macro.

The merged file is now only used for text conflicts, where it always equals
the local_abspath of the conflicted file. So the resolver can use the file's
local_abspath instead.

* subversion/include/svn_client.h
  (svn_client_conflict_get_merged_file): Remove.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict, conflict_func_interactive): Use file's local_abspath
   instead of merged_file.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1687456&r1=1687455&r2=1687456&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Jun 25 09:20:54 2015
@@ -4552,17 +4552,6 @@ svn_client_conflict_text_get_contents(
   apr_pool_t *result_pool,
   apr_pool_t *scratch_pool);
 
-/**
- * Accessor functions for svn_wc_conflict_description2_t. This is a temporary
- * API for eventually replacing svn_wc_conflict_description2_t with an opaque
- * type and providing improved APIs for conflict resolution.
- * 
- * @since New in 1.10. 
- */
-
-#define svn_client_conflict_get_merged_file(conflict) \
-  ((conflict)->merged_file)
-
 /** @} */
 
 /**

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1687456&r1=1687455&r2=1687456&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jun 25 09:20:54 2015
@@ -729,7 +729,7 @@ handle_text_conflict(svn_wc_conflict_res
   const char *base_abspath;
   const char *my_abspath;
   const char *their_abspath;
-  const char *merged_abspath = svn_client_conflict_get_merged_file(desc);
+  const char *merged_abspath = svn_client_conflict_get_local_abspath(desc);
 
   SVN_ERR(svn_client_conflict_text_get_contents(NULL, &my_abspath,
                                                 &base_abspath, &their_abspath,
@@ -1262,7 +1262,7 @@ conflict_func_interactive(svn_wc_conflic
   const char *base_abspath = NULL;
   const char *my_abspath = NULL;
   const char *their_abspath = NULL;
-  const char *merged_abspath = svn_client_conflict_get_merged_file(desc);
+  const char *merged_abspath = svn_client_conflict_get_local_abspath(desc);
 
   if (svn_client_conflict_get_kind(desc) == svn_wc_conflict_kind_text)
     SVN_ERR(svn_client_conflict_text_get_contents(NULL, &my_abspath,