| Log Message: |
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.
|
subversion/trunk/subversion/libsvn_client/merge.c