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 2010/08/26 13:45:17 UTC
svn commit: r989610 -
/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: julianfoad
Date: Thu Aug 26 11:45:16 2010
New Revision: 989610
URL: http://svn.apache.org/viewvc?rev=989610&view=rev
Log:
Correct an XFail test so that it passes.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(tree_conflicts_on_merge_no_local_ci_5_1): Correct the expectations of
which nodes have properties; these were simply wrong.
(test_list): Remove 'XFail' from that test.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_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=989610&r1=989609&r2=989610&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Thu Aug 26 11:45:16 2010
@@ -1138,23 +1138,23 @@ def tree_conflicts_on_merge_no_local_ci_
'D/D1' : Item(status=' M', treeconflict='C', wc_rev='3'),
'D/D1/delta' : Item(status='A ', wc_rev='0'),
'DD' : Item(status=' ', wc_rev='3'),
- 'DD/D1' : Item(status=' M', treeconflict='C', wc_rev='3'),
- 'DD/D1/D2' : Item(status=' ', wc_rev='3'),
+ 'DD/D1' : Item(status=' ', treeconflict='C', wc_rev='3'),
+ 'DD/D1/D2' : Item(status=' M', wc_rev='3'),
'DD/D1/D2/epsilon' : Item(status='A ', wc_rev='0'),
'DDD' : Item(status=' ', wc_rev='3'),
- 'DDD/D1' : Item(status=' M', treeconflict='C', wc_rev='3'),
+ 'DDD/D1' : Item(status=' ', treeconflict='C', wc_rev='3'),
'DDD/D1/D2' : Item(status=' ', wc_rev='3'),
- 'DDD/D1/D2/D3' : Item(status=' ', wc_rev='3'),
+ 'DDD/D1/D2/D3' : Item(status=' M', wc_rev='3'),
'DDD/D1/D2/D3/zeta' : Item(status='A ', wc_rev='0'),
'DDF' : Item(status=' ', wc_rev='3'),
- 'DDF/D1' : Item(status=' M', treeconflict='C', wc_rev='3'),
+ 'DDF/D1' : Item(status=' ', treeconflict='C', wc_rev='3'),
'DDF/D1/D2' : Item(status=' ', wc_rev='3'),
- 'DDF/D1/D2/gamma' : Item(status='M ', wc_rev='3'),
+ 'DDF/D1/D2/gamma' : Item(status='MM', wc_rev='3'),
'DF' : Item(status=' ', wc_rev='3'),
- 'DF/D1' : Item(status=' M', treeconflict='C', wc_rev='3'),
- 'DF/D1/beta' : Item(status='M ', wc_rev='3'),
+ 'DF/D1' : Item(status=' ', treeconflict='C', wc_rev='3'),
+ 'DF/D1/beta' : Item(status='MM', wc_rev='3'),
'F' : Item(status=' ', wc_rev='3'),
- 'F/alpha' : Item(status='M ', treeconflict='C', wc_rev='3'),
+ 'F/alpha' : Item(status='MM', treeconflict='C', wc_rev='3'),
})
expected_skip = svntest.wc.State('', {
@@ -1895,7 +1895,7 @@ test_list = [ None,
tree_conflicts_on_merge_local_ci_6,
tree_conflicts_on_merge_no_local_ci_4_1,
tree_conflicts_on_merge_no_local_ci_4_2,
- XFail(tree_conflicts_on_merge_no_local_ci_5_1),
+ tree_conflicts_on_merge_no_local_ci_5_1,
XFail(tree_conflicts_on_merge_no_local_ci_5_2),
tree_conflicts_on_merge_no_local_ci_6,
tree_conflicts_merge_edit_onto_missing,