tree 9dd6e891abcb93f6c2341e8a617c27de620d9337
parent 32bc668ccc42a42671a8e77aeb33325f4347af28
author Julian Foad <julianfoad@apache.org> 1595495951 +0000
committer Julian Foad <julianfoad@apache.org> 1595495951 +0000

Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic".

In certain merge scenarios where the merge added new paths, the mergeinfo
change notifications and the resulting mergeinfo were non-deterministic.

* subversion/libsvn_client/merge.c
  (process_children_with_new_mergeinfo): Process these paths in parent-to-
    child order so that inherited mergeinfo is propagated consistently.

* subversion/tests/cmdline/merge_tests.py
  (merge_deleted_folder_with_mergeinfo_2): Check the mergeinfo change
    notifications and the resulting mergeinfo, as these are now stable.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1880192 13f79535-47bb-0310-9956-ffa450edef68