r1885983 | hartmannathan | 2021-01-28 16:28:40 +0000 (Thu, 28 Jan 2021)
Merge the issue-4869 branch: fixes the issue and adds regression test
* subversion/svn/cl-conflicts.c:
(append_tree_conflict_info_xml): Fix output of 'svn info --xml' for right
side of tree conflict. (Left side was correct.)
(svn_cl__append_conflict_info_xml): Fix output of 'svn info --xml' for right
side of text conflict or property conflict. (Left side was correct.)
* subversion/tests/cmdline/info_tests.py:
(info_tree_conflict_source): New test.
(test_list): Run it.
Reported by: David Matthews <david matthews at metoffice gov uk>
Patch by: futatuki
(tree conflict case)
me
(text and property conflict cases)
Suggested by: stsp
(to add a regression test)