tree d69d23a8f3b9ca58152c789e04fc64014f26cf2e
parent 4782f0219271c06dfe17b176678db632f21123bf
author Julian Foad <julianfoad@apache.org> 1592584097 +0000
committer Julian Foad <julianfoad@apache.org> 1592584097 +0000

Add a test for issue #4859: Merge removing a folder with non-inheritable
mergeinfo.

The merge fails like this:
> svn merge -c4 ^/branch_A .../A
> --- Merging r4 into '.../A':
> D    .../A/D
> svn: E155023: Can't set properties on '/.../A/D/gamma':
> invalid status for updating properties.

* subversion/tests/cmdline/merge_tests.py
  (merge_deleted_folder_with_mergeinfo): New test.
  (test_list): Run it.


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