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/11/15 20:43:33 UTC
svn commit: r1409950 -
/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
Author: julianfoad
Date: Thu Nov 15 19:43:32 2012
New Revision: 1409950
URL: http://svn.apache.org/viewvc?rev=1409950&view=rev
Log:
* subversion/tests/cmdline/merge_automatic_tests.py
(subtree_to_and_fro): Link to issue #4258 that I filed to track this.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py?rev=1409950&r1=1409949&r2=1409950&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py Thu Nov 15 19:43:32 2012
@@ -758,6 +758,7 @@ def cherry3_fwd(sbox):
# Automatic merges ignore subtree mergeinfo during reintegrate.
@SkipUnless(server_has_mergeinfo)
@XFail()
+@Issue(4258)
def subtree_to_and_fro(sbox):
"reintegrate considers source subtree mergeinfo"