On Wed, Jan 20, 2021 at 4:39 PM Stefan Sperling <s...@apache.org> wrote:
> 'make check' keeps passing with the patch applied, which is both good and > bad news: The patch doesn't break anything but our test suite should have > caught this issue in the first place. > > I agree that adding test coverage for this problem would be very useful. branches/issue-4869 is ready for review: bugfix and new regression test. The bugfix is very simple, but I'd like a review of the new regression test please. I hope someone can review it in time to merge/nominate/vote for 1.10.x and 1.14.x before stsp rolls the rc artifacts this week. Details: The branch contains a new regression test to catch wrong 'source-right' of conflict when 'svn info --xml' is run on an item with tree conflict, text conflict, or property conflict. The branch contains the fixes for all three above cases. The test can be seen failing by updating to r1885881, building, and running: $ make check TESTS=subversion/tests/cmdline/info_tests.py#21 The test can be seen passing by updating to r1885883, make, and running above make check again. Thanks! Nathan
