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

[stsp]

Author: stsp
Date: Wed Oct 12 10:09:00 2016
New Revision: 1764427

URL: http://svn.apache.org/viewvc?rev=1764427&view=rev
Log:
Remove an unnecessary and unused output parameter from a helper function.

* subversion/libsvn_client/conflicts.c
  (merge_newly_added_dir): Remove the 'conflict_report' output argument.
  (resolve_merge_incoming_added_dir_merge): Update caller.

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=1764427&r1=1764426&r2=1764427&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Oct 12 10:09:00 
2016
@@ -5823,8 +5823,7 @@ diff_file_added(const char *relpath,
  * does exist in REV2. Thus we use a diff processor.
  */
 static svn_error_t *
-merge_newly_added_dir(svn_client__conflict_report_t **conflict_report,
-                      const char *added_repos_relpath,
+merge_newly_added_dir(const char *added_repos_relpath,
                       const char *source1,
                       svn_revnum_t rev1,
                       const char *source2,
@@ -5928,7 +5927,6 @@ resolve_merge_incoming_added_dir_merge(s
   const char *local_abspath;
   const char *lock_abspath;
   struct conflict_tree_incoming_add_details *details;
-  svn_client__conflict_report_t *conflict_report;
   const char *added_repos_relpath;
   const char *source1;
   svn_revnum_t rev1;
@@ -5998,15 +5996,11 @@ resolve_merge_incoming_added_dir_merge(s
                                                  scratch_pool, scratch_pool));
 
   /* ### wrap in a transaction */
-  err = merge_newly_added_dir(&conflict_report, added_repos_relpath,
+  err = merge_newly_added_dir(added_repos_relpath,
                               source1, rev1, source2, rev2,
                               local_abspath,
                               (incoming_old_pegrev > incoming_new_pegrev),
                               ctx, scratch_pool, scratch_pool);
-
-  err = svn_error_compose_create(err,
-                                 svn_client__make_merge_conflict_error(
-                                   conflict_report, scratch_pool));
   if (!err)
     err = svn_wc__del_tree_conflict(ctx->wc_ctx, local_abspath, scratch_pool);