svn commit: r1070630 - in /subversion/trunk: notes/xfail-status subversion/tests/cmdline/merge_tree_conflict_tests.py

[pb...@apache.org]

Author: pburba
Date: Mon Feb 14 19:59:30 2011
New Revision: 1070630

URL: http://svn.apache.org/viewvc?rev=1070630&view=rev
Log:
Associate a XFailing test with issue #3806.

* notes/xfail-status: Update

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (merge_replace_causes_tree_conflict2): Add @Issue decorator.


Modified:
    subversion/trunk/notes/xfail-status
    subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py

Modified: subversion/trunk/notes/xfail-status
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/xfail-status?rev=1070630&r1=1070629&r2=1070630&view=diff
==============================================================================
--- subversion/trunk/notes/xfail-status (original)
+++ subversion/trunk/notes/xfail-status Mon Feb 14 19:59:30 2011
@@ -292,11 +292,11 @@ Test #  Mode   Test Description
   Point Person: julianfoad
   
   23    XFAIL  replace vs. delete tree-conflicts
-  Issue #: None
-  Target Milestone: N/A
+  Issue #: 3806
+  Target Milestone: Unscheduled
   Thread: N/A
   Log: r879162
-  Point Person: neels
+  Point Person:
 
 LISTING: patch_tests.py
 

Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1070630&r1=1070629&r2=1070630&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Mon Feb 14 19:59:30 2011
@@ -1751,6 +1751,7 @@ def merge_replace_causes_tree_conflict(s
 
 #----------------------------------------------------------------------
 @XFail()
+@Issue(3806)
 def merge_replace_causes_tree_conflict2(sbox):
   "replace vs. delete tree-conflicts"