svn commit: r1160427 - /subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py

[pb...@apache.org]

Author: pburba
Date: Mon Aug 22 20:52:34 2011
New Revision: 1160427

URL: http://svn.apache.org/viewvc?rev=1160427&view=rev
Log:
On the issue-3975 branch: 

* subversion/tests/cmdline/merge_tests.py
  (merge_adds_subtree_with_mergeinfo): Remove XFail decorator and comment.
   This test was actually fixed with r1154375 (but that rev broke several
   other tests, which is why this branch is still alive).

Modified:
    subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py

Modified: subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py?rev=1160427&r1=1160426&r2=1160427&view=diff
==============================================================================
--- subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/issue-3975/subversion/tests/cmdline/merge_tests.py Mon Aug 22 20:52:34 2011
@@ -16711,7 +16711,6 @@ 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):
@@ -16806,10 +16805,6 @@ def merge_adds_subtree_with_mergeinfo(sb
     'B/lambda'  : Item("This is the file 'lambda'.\n"),
     'B/F'       : Item(),
     'C'         : Item(),
-    # Currently this test fails because A_COPY_2/C/nu gets no
-    # mergeinfo set on it to describe the merge, it only has
-    # the explicit mergeinfo from its copy source (i.e. /A_COPY/C/nu:10
-    # from ^/A/C/nu@11.
     'C/nu'      : Item("This is the file 'nu'.\n" \
                        "More work on the A_COPY branch.\n" \
                        "A faux conflict resolution.\n",