You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2012/12/21 22:47:10 UTC
svn commit: r1425157 -
/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: pburba
Date: Fri Dec 21 21:47:10 2012
New Revision: 1425157
URL: http://svn.apache.org/viewvc?rev=1425157&view=rev
Log:
Follow-up to r1424469, revert to previous test expectations and set
tests to XFail.
See http://svn.haxx.se/dev/archive-2012-12/0475.shtml
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(tree_conflicts_merge_edit_onto_missing,
tree_conflicts_merge_del_onto_missing):Adjust to r1424468 expectations,
set to XFail, and add explanatory comments.
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=1425157&r1=1425156&r2=1425157&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri Dec 21 21:47:10 2012
@@ -1271,6 +1271,7 @@ def tree_conflicts_on_merge_no_local_ci_
) ], False)
#----------------------------------------------------------------------
+@XFail()
def tree_conflicts_merge_edit_onto_missing(sbox):
"tree conflicts: tree missing, leaf edit"
@@ -1329,11 +1330,20 @@ def tree_conflicts_merge_edit_onto_missi
expected_status.tweak('DDD/D1/D2', wc_rev=3, status='! ')
expected_status.tweak('DDD/D1/D2/D3', wc_rev=3, status='! ')
+ # Currently this fails due to r1424469, we are not showing the roots of
+ # missing subtrees as skipped even though there are operative changes
+ # within those subtrees.
+ # See http://svn.haxx.se/dev/archive-2012-12/0472.shtml
+ # and http://svn.haxx.se/dev/archive-2012-12/0475.shtml
expected_skip = svntest.wc.State('', {
'F/alpha' : Item(),
# BH: After fixing several issues in the obstruction handling
- # I get the following Skip notification. Please review!
+ # I get the following Skip notifications. Please review!
'D/D1' : Item(),
+ 'DD/D1' : Item(),
+ 'DF/D1' : Item(),
+ 'DDD/D1' : Item(),
+ 'DDF/D1' : Item(),
})
@@ -1349,6 +1359,7 @@ def tree_conflicts_merge_edit_onto_missi
) ], False, do_commit_conflicts=False, ignore_ancestry=True)
#----------------------------------------------------------------------
+@XFail()
def tree_conflicts_merge_del_onto_missing(sbox):
"tree conflicts: tree missing, leaf del"
@@ -1407,9 +1418,21 @@ def tree_conflicts_merge_del_onto_missin
expected_status.tweak('DDD/D1/D2', wc_rev=3, status='! ')
expected_status.tweak('DDD/D1/D2/D3', wc_rev=3, status='! ')
+ # Currently this fails due to r1424469, we are not showing the roots of
+ # missing subtrees as skipped even though there are operative changes
+ # within those subtrees.
+ # See http://svn.haxx.se/dev/archive-2012-12/0472.shtml
+ # and http://svn.haxx.se/dev/archive-2012-12/0475.shtml
expected_skip = svntest.wc.State('', {
'F/alpha' : Item(),
'D/D1' : Item(),
+ # BH: After fixing several issues in the obstruction handling
+ # I get the following Skip notifications. Please review!
+ 'D/D1' : Item(),
+ 'DD/D1' : Item(),
+ 'DF/D1' : Item(),
+ 'DDD/D1' : Item(),
+ 'DDF/D1' : Item(),
})
svntest.actions.deep_trees_run_tests_scheme_for_merge(sbox,