You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/06/12 15:31:22 UTC
svn commit: r1349331 -
/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
Author: julianfoad
Date: Tue Jun 12 13:31:21 2012
New Revision: 1349331
URL: http://svn.apache.org/viewvc?rev=1349331&view=rev
Log:
Remove 'XFail' from merge_symmetric_tests.py 19, as that case was fixed by
r1349322.
* subversion/tests/cmdline/merge_symmetric_tests.py
(merge_to_reverse_cherry_subtree_to_merge_to): Remove XFail.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py?rev=1349331&r1=1349330&r2=1349331&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Tue Jun 12 13:31:21 2012
@@ -848,7 +848,6 @@ def subtree_to_and_fro(sbox):
# Symmetric merges ignore subtree mergeinfo gaps older than the last rev
# synced to the target root.
@SkipUnless(server_has_mergeinfo)
-@XFail()
def merge_to_reverse_cherry_subtree_to_merge_to(sbox):
"sync merge ignores source subtree mergeinfo"