On the 1.6.x-issue3650 branch: Merge r1076730 from trunk. * src-branch-1.6.x-WCNG Mergeinfo changes only. * subversion/tests/cmdline/log_tests.py (merge_sensitive_log_ignores_cyclic_merges): Remove trunk-only XFail, skip, and issue decorators and add their equivalents... (test_list): ...here. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3650@1095511 13f79535-47bb-0310-9956-ffa450edef68