| commit | 98ba3d2862db5d649c8244a15359f1849e13ce44 | [log] [tgz] |
|---|---|---|
| author | Julian Foad <julianfoad@apache.org> | Thu Jul 16 14:40:27 2020 +0000 |
| committer | Julian Foad <julianfoad@apache.org> | Thu Jul 16 14:40:27 2020 +0000 |
| tree | 38ea826b4c67626c9c369dec0eb5b8df9049dc81 | |
| parent | b38098f3cd14723245b4dad0ef512547f96c78c3 [diff] |
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. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1879959 13f79535-47bb-0310-9956-ffa450edef68