svn commit: r1339217 - /subversion/trunk/subversion/libsvn_client/merge.c

[ju...@apache.org]

Author: julianfoad
Date: Wed May 16 15:11:49 2012
New Revision: 1339217

URL: http://svn.apache.org/viewvc?rev=1339217&view=rev
Log:
Remove a structure field that has been unused since r867591 (4 years ago).

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): Remove the unused field 'target_missing_child'.
  (do_mergeinfo_aware_dir_merge, do_merge): Don't write to that field.

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=1339217&r1=1339216&r2=1339217&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed May 16 15:11:49 2012
@@ -203,9 +203,6 @@ typedef struct merge_cmd_baton_t {
   svn_boolean_t ignore_ancestry;      /* Are we ignoring ancestry (and by
                                          extension, mergeinfo)?  FALSE if
                                          SOURCES_ANCESTRAL is FALSE. */
-  svn_boolean_t target_missing_child; /* Whether working copy target of the
-                                         merge is missing any immediate
-                                         children. */
   svn_boolean_t reintegrate_merge;    /* Whether this is a --reintegrate
                                          merge or not. */
   const char *added_path;             /* Set to the dir path whenever the
@@ -8543,8 +8540,6 @@ do_mergeinfo_aware_dir_merge(svn_mergein
      the target thanks to depth-first ordering. */
   target_merge_path = APR_ARRAY_IDX(notify_b->children_with_mergeinfo, 0,
                                     svn_client__merge_path_t *);
-  merge_b->target_missing_child = (target_merge_path->missing_child
-                                   || target_merge_path->switched_child);
 
   /* If we are honoring mergeinfo, then for each item in
      NOTIFY_B->CHILDREN_WITH_MERGEINFO, we need to calculate what needs to be
@@ -9014,7 +9009,6 @@ do_merge(apr_hash_t **modified_subtrees,
   merge_cmd_baton.same_repos = same_repos;
   merge_cmd_baton.mergeinfo_capable = FALSE;
   merge_cmd_baton.ctx = ctx;
-  merge_cmd_baton.target_missing_child = FALSE;
   merge_cmd_baton.reintegrate_merge = reintegrate_merge;
   merge_cmd_baton.target = target;
   merge_cmd_baton.pool = iterpool;