| Log Message: |
In recent merge tests, verify the merge result as well as success.
For issue #4859 "Merge removing a folder with non-inheritable mergeinfo ->
E155023: can't set properties: invalid status for updating properties".
* subversion/tests/cmdline/merge_tests.py
(merge_deleted_folder_with_mergeinfo,
merge_deleted_folder_with_mergeinfo_2): Verify the merge result.
|
subversion/trunk/subversion/tests/cmdline/merge_tests.py