Author: pburba
Date: Fri Jul 29 15:59:14 2011
New Revision: 1152286
URL: http://svn.apache.org/viewvc?rev=1152286&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(merge_adds_subtree_with_mergeinfo): Follow-up to r1152267, set to XFail,
issue #3975 is still open.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1152286&r1=1152285&r2=1152286&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Jul 29
15:59:14 2011
@@ -16712,6 +16712,7 @@ def foreign_repos_prop_conflict(sbox):
#----------------------------------------------------------------------
# Test for issue #3975 'adds with explicit mergeinfo don't get mergeinfo
# describing merge which added them'
+@XFail()
@Issue(3975)
@SkipUnless(server_has_mergeinfo)
def merge_adds_subtree_with_mergeinfo(sbox):
