svn commit: r1407079 - /subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Thu Nov  8 13:51:40 2012
New Revision: 1407079

URL: http://svn.apache.org/viewvc?rev=1407079&view=rev
Log:
* subversion/tests/cmdline/merge_automatic_tests.py
  (cherry2_fwd, cherry3_fwd): Associate these XFail tests with issue #4255.

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=1407079&r1=1407078&r2=1407079&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py Thu Nov  8 13:51:40 2012
@@ -83,6 +83,8 @@ from merge_tests import set_up_branch
 #     B (--o--x--o-----?--x
 #
 #   Merge with cherry-picks
+#   (This set of six cases represents all of the topologically distinct
+#   scenarios involving one cherry-pick between two automatic merges.)
 #
 #     Cherry1, fwd
 #     A (--o-----o-[o]----o---
@@ -701,6 +703,7 @@ def cherry1_fwd(sbox):
 
 @SkipUnless(server_has_mergeinfo)
 @XFail()
+@Issue(4255)
 def cherry2_fwd(sbox):
   """cherry2_fwd"""
 
@@ -721,6 +724,7 @@ def cherry2_fwd(sbox):
 
 @SkipUnless(server_has_mergeinfo)
 @XFail()
+@Issue(4255)
 def cherry3_fwd(sbox):
   """cherry3_fwd"""