On the 1.5.x-34184 branch:
* subversion/tests/cmdline/merge_tests.py:
(test_list): Remove XFail from reintegrate_branch_never_merged_to. That
test was failing because there was subtree mergeinfo. r34184 stops
this subtree mergeinfo from being created in the first place so the test
now passes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-34184@874664 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/tests/cmdline/merge_tests.py b/subversion/tests/cmdline/merge_tests.py
index f492471..fde1d09 100755
--- a/subversion/tests/cmdline/merge_tests.py
+++ b/subversion/tests/cmdline/merge_tests.py
@@ -13709,7 +13709,7 @@
SkipUnless(basic_reintegrate,
server_has_mergeinfo),
XFail(reintegrate_with_rename),
- XFail(reintegrate_branch_never_merged_to),
+ reintegrate_branch_never_merged_to,
reintegrate_fail_on_modified_wc,
reintegrate_fail_on_mixed_rev_wc,
reintegrate_fail_on_switched_wc,
