You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/07 01:38:42 UTC
svn commit: r1443290 - in /subversion/trunk/subversion/tests/cmdline:
merge_tree_conflict_tests.py svntest/deeptrees.py
Author: rhuijben
Date: Thu Feb 7 00:38:42 2013
New Revision: 1443290
URL: http://svn.apache.org/viewvc?rev=1443290&view=rev
Log:
Update expected test test results on another issue #2282 or tree conflict test.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(tree_conflicts_on_merge_local_ci_5_1): Update revisions to match output and
the status to what the comment in this function says it should be:
no deletes, just conflicts!
* subversion/tests/cmdline/svntest/deeptrees.py
(deep_trees_run_tests_scheme_for_merge): Pass --allow-mixed-revisions, as
these tests are about tree conflicts, not detecting mixed revision
problems.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.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=1443290&r1=1443289&r2=1443290&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Thu Feb 7 00:38:42 2013
@@ -888,7 +888,6 @@ def tree_conflicts_on_merge_local_ci_4_2
expected_skip) ], True)
#----------------------------------------------------------------------
-@XFail()
@Issue(2282)
def tree_conflicts_on_merge_local_ci_5_1(sbox):
"tree conflicts 5.1: leaf edit, tree del"
@@ -906,23 +905,23 @@ def tree_conflicts_on_merge_local_ci_5_1
'' : Item(status=' M', wc_rev='3'),
'D' : Item(status=' ', wc_rev='3'),
'D/D1' : Item(status=' ', treeconflict='C', wc_rev='4'),
- 'D/D1/delta' : Item(status='D ', wc_rev='4'),
+ 'D/D1/delta' : Item(status=' ', wc_rev='4'),
'DD' : Item(status=' ', wc_rev='3'),
- 'DD/D1' : Item(status=' ', treeconflict='C', wc_rev='4'),
- 'DD/D1/D2' : Item(status='D ', wc_rev='3'),
- 'DD/D1/D2/epsilon' : Item(status='D ', wc_rev='4'),
+ 'DD/D1' : Item(status=' ', treeconflict='C', wc_rev='3'),
+ 'DD/D1/D2' : Item(status=' ', wc_rev='4'),
+ 'DD/D1/D2/epsilon' : Item(status=' ', wc_rev='4'),
'DDD' : Item(status=' ', wc_rev='3'),
- 'DDD/D1' : Item(status=' ', treeconflict='C', wc_rev='4'),
- 'DDD/D1/D2' : Item(status='D ', wc_rev='3'),
- 'DDD/D1/D2/D3' : Item(status='D ', wc_rev='3'),
- 'DDD/D1/D2/D3/zeta' : Item(status='D ', wc_rev='4'),
+ '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='4'),
+ 'DDD/D1/D2/D3/zeta' : Item(status=' ', wc_rev='4'),
'DDF' : Item(status=' ', wc_rev='3'),
- 'DDF/D1' : Item(status=' ', treeconflict='C', wc_rev='4'),
- 'DDF/D1/D2' : Item(status='D ', wc_rev='3'),
- 'DDF/D1/D2/gamma' : Item(status='D ', wc_rev='4'),
+ 'DDF/D1' : Item(status=' ', treeconflict='C', wc_rev='3'),
+ 'DDF/D1/D2' : Item(status=' ', wc_rev='3'),
+ 'DDF/D1/D2/gamma' : Item(status=' ', wc_rev='4'),
'DF' : Item(status=' ', wc_rev='3'),
- 'DF/D1' : Item(status=' ', treeconflict='C', wc_rev='4'),
- 'DF/D1/beta' : Item(status='D ', wc_rev='4'),
+ 'DF/D1' : Item(status=' ', treeconflict='C', wc_rev='3'),
+ 'DF/D1/beta' : Item(status=' ', wc_rev='4'),
'F' : Item(status=' ', wc_rev='3'),
'F/alpha' : Item(status=' ', treeconflict='C', wc_rev='4'),
Modified: subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py?rev=1443290&r1=1443289&r2=1443290&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py Thu Feb 7 00:38:42 2013
@@ -981,7 +981,7 @@ def deep_trees_run_tests_scheme_for_merg
x_skip.copy()
x_skip.wc_dir = local
- varargs = (local,)
+ varargs = (local,'--allow-mixed-revisions',)
if ignore_ancestry:
varargs = varargs + ('--ignore-ancestry',)