/[Apache-SVN]
ViewVC logotype

Revision 1885983


Jump to revision: Previous Next
Author: hartmannathan
Date: Thu Jan 28 16:28:40 2021 UTC (3 years, 2 months ago)
Changed paths: 3
Log Message:
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)


Changed paths

Path Details
Directorysubversion/trunk/ modified , props changed
Directorysubversion/trunk/subversion/svn/cl-conflicts.c modified , text changed
Directorysubversion/trunk/subversion/tests/cmdline/info_tests.py modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26