subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject svn commit: r929786 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 01 Apr 2010 02:38:57 GMT
Author: gstein
Date: Thu Apr  1 02:38:56 2010
New Revision: 929786

URL: http://svn.apache.org/viewvc?rev=929786&view=rev
Log:
Fix a bug in merge_file_deleted, and remove a constant parameter.

* subversion/libsvn_client/merge.c:
  (merge_file_deleted): fix check/assign of TREE_CONFLICTED
  (drive_merge_report_editor): remove CALLBACKS param and simply pass
    &merge_callbacks to svn_client__get_diff_editor()
  (do_mergeinfo_unaware_dir_merge, do_directory_merge): don't bother to
    pass merge_callbacks to drive_merge_report_editor

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=929786&r1=929785&r2=929786&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Apr  1 02:38:56 2010
@@ -1879,8 +1879,8 @@ merge_file_deleted(const char *local_dir
 
   SVN_ERR(svn_dirent_get_absolute(&mine_abspath, mine, subpool));
 
-  if (*tree_conflicted)
-    tree_conflicted = FALSE;
+  if (tree_conflicted)
+    *tree_conflicted = FALSE;
 
   /* Easy out:  if we have no adm_access for the parent directory,
      then this portion of the tree-delta "patch" must be inapplicable.
@@ -4632,8 +4632,7 @@ remove_children_with_deleted_mergeinfo(m
    to the reporter.
 
    DEPTH, NOTIFY_B, and MERGE_B are cascasded from do_directory_merge(), see
-   that function for more info.  CALLBACKS are the svn merge versions of
-   the svn_wc_diff_callbacks4_t callbacks invoked by the editor.
+   that function for more info.
 
    If MERGE_B->sources_ancestral is set, then URL1@REVISION1 must be a
    historical ancestor of URL2@REVISION2, or vice-versa (see
@@ -4649,7 +4648,6 @@ drive_merge_report_editor(const char *ta
                           const apr_array_header_t *children_with_mergeinfo,
                           svn_depth_t depth,
                           notification_receiver_baton_t *notify_b,
-                          const svn_wc_diff_callbacks4_t *callbacks,
                           merge_cmd_baton_t *merge_b,
                           apr_pool_t *pool)
 {
@@ -4727,7 +4725,7 @@ drive_merge_report_editor(const char *ta
   /* Get the diff editor and a reporter with which to, ultimately,
      drive it. */
   SVN_ERR(svn_client__get_diff_editor(target_abspath, merge_b->ctx->wc_ctx,
-                                      callbacks, merge_b, depth,
+                                      &merge_callbacks, merge_b, depth,
                                       merge_b->dry_run,
                                       merge_b->ra_session2, revision1,
                                       notification_receiver, notify_b,
@@ -6808,7 +6806,6 @@ do_mergeinfo_unaware_dir_merge(const cha
   return drive_merge_report_editor(target_dir_wcpath,
                                    url1, revision1, url2, revision2,
                                    NULL, depth, notify_b,
-                                   &merge_callbacks,
                                    merge_b, pool);
 }
 
@@ -7729,7 +7726,7 @@ do_directory_merge(const char *url1,
                 real_url2, end_rev,
                 notify_b->children_with_mergeinfo,
                 depth, notify_b,
-                &merge_callbacks, merge_b,
+                merge_b,
                 iterpool));
               if (old_sess1_url)
                 SVN_ERR(svn_ra_reparent(merge_b->ra_session1,
@@ -7791,7 +7788,7 @@ do_directory_merge(const char *url1,
                                             url1, revision1, url2, revision2,
                                             NULL,
                                             depth, notify_b,
-                                            &merge_callbacks, merge_b,
+                                            merge_b,
                                             pool));
         }
     }



Mime
View raw message