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.
* merge_tests.py (merge_conflict_markers_matching_eol), * patch_tests.py (patch_no_svn_eol_style, patch_with_svn_eol_style, patch_with_svn_eol_style_uncommitted), * update_tests.py (conflict_markers_matching_eol): Use binary mode to write file contents for strict eol style.
* merge_tests.py (merge_conflict_markers_matching_eol), * patch_tests.py (patch_with_svn_eol_style, patch_with_svn_eol_style_uncommitted), * conflict_markers_matching_eol): Switch per platform eol value for 'native' svn:eol-style
* svntest/wc.py (State.from_wc): Use io.open() explicitly to specify 'newline' parameter for universal newline, even on Python 2. With this change, '\r' end of line chracters in files are also translated to '\n' if keep_eol_style=False (or unspicified) on Python 2. Also explicitly specify encoding to 'utf-8' not to be affected by Python's file system encoding.