svn commit: r1879474 - in /subversion/trunk/subversion/libsvn_client: merge.c mergeinfo.h

[ju...@apache.org]

Author: julianfoad
Date: Fri Jul  3 13:26:44 2020
New Revision: 1879474

URL: http://svn.apache.org/viewvc?rev=1879474&view=rev
Log:
Remove an unused field in merge code.

There is no code anywhere that sets this flag.  There was in svn 1.6, but
not in svn 1.7 and later.

For issue #4859 "Merge removing a folder with non-inheritable mergeinfo ->
E155023: can't set properties: invalid status for updating properties".

* subversion/libsvn_client/mergeinfo.h
  (svn_client__merge_path_t): Remove 'scheduled_for_deletion' field.

* subversion/libsvn_client/merge.c
  (remove_absent_children): Remove reference to it.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1879474&r1=1879473&r2=1879474&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jul  3 13:26:44 2020
@@ -5614,7 +5614,7 @@ svn_client__make_merge_conflict_error(sv
    with paths (svn_client__merge_path_t *) arranged in depth first order,
    which have mergeinfo set on them or meet one of the other criteria
    defined in get_mergeinfo_paths().  Remove any paths absent from disk
-   or scheduled for deletion from CHILDREN_WITH_MERGEINFO which are equal to
+   from CHILDREN_WITH_MERGEINFO which are equal to
    or are descendants of TARGET_WCPATH by setting those children to NULL. */
 static svn_error_t *
 remove_absent_children(const char *target_wcpath,
@@ -5628,7 +5628,7 @@ remove_absent_children(const char *targe
     {
       svn_client__merge_path_t *child =
         APR_ARRAY_IDX(children_with_mergeinfo, i, svn_client__merge_path_t *);
-      if ((child->absent || child->scheduled_for_deletion)
+      if (child->absent
           && svn_dirent_is_ancestor(target_wcpath, child->abspath))
         {
           SVN_ERR(svn_sort__array_delete2(children_with_mergeinfo, i--, 1));

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1879474&r1=1879473&r2=1879474&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Fri Jul  3 13:26:44 2020
@@ -74,8 +74,6 @@ typedef struct svn_client__merge_path_t
                                            prior to a merge.  May be NULL. */
   svn_boolean_t inherited_mergeinfo;    /* Whether PRE_MERGE_MERGEINFO was
                                            explicit or inherited. */
-  svn_boolean_t scheduled_for_deletion; /* ABSPATH is scheduled for
-                                           deletion. */
   svn_boolean_t immediate_child_dir;    /* ABSPATH is an immediate child
                                            directory of the merge target,
                                            has no explicit mergeinfo prior