Follow up to r1880192: Fix an EOL issue in test on Windows.
* subversion/tests/cmdline/merge-tests.py
(merge_deleted_folder_with_mergeinfo_2): Use os.linesep instead of '\n'
in expected values of svn:mergeinfo.
@@ -18639,11 +18639,19 @@ def merge_deleted_folder_with_mergeinfo_2(sbox):
)
# verify that mergeinfo is set/changed on A/D, A/D/G, A/D/G2.
+
+ # NOTE: When writing out multi-line prop values in svn:* props, the
+ # client converts to local encoding and local eol style.
+ # Therefore, the expected output must contain the right kind of eoln
+ # strings. That's why we use os.linesep in the tests below, not just
+ # plain '\n'. The _last_ \n is also from the client, but it's not
+ # part of the prop value and it doesn't get converted in the pipe.
+
expected_mergeinfo = [
('A', ['/branch_A:3-7']),
- ('A/D', ['/branch_A/D:5-7\n', '/branch_B/C:1*']),
- ('A/D/G', ['/branch_A/D/G:5-7\n', '/branch_B/C/G:1*']),
- ('A/D/G2', ['/branch_A/D/G2:5-7\n', '/branch_B/C/G2:1*']),
+ ('A/D', ['/branch_A/D:5-7'+os.linesep, '/branch_B/C:1*']),
+ ('A/D/G', ['/branch_A/D/G:5-7'+os.linesep, '/branch_B/C/G:1*']),
+ ('A/D/G2', ['/branch_A/D/G2:5-7'+os.linesep, '/branch_B/C/G2:1*']),
]
for path, mergeinfo in expected_mergeinfo:
svntest.actions.check_prop('svn:mergeinfo', sbox.ospath(path),
