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/25 19:40:52 UTC
svn commit: r989249 -
/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: julianfoad
Date: Wed Aug 25 17:40:51 2010
New Revision: 989249
URL: http://svn.apache.org/viewvc?rev=989249&view=rev
Log:
* subversion/tests/cmdline/merge_tree_conflict_tests.py
Revert r989235 (an attempt to make tests work in single-DB mode).
It doesn't work because wc_is_singledb() tests an existing WC and the
WC isn't yet created at this point in these tests.
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=989249&r1=989248&r2=989249&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Wed Aug 25 17:40:51 2010
@@ -803,25 +803,6 @@ disk_after_leaf_edit = svntest.actions.d
disk_after_leaf_del = svntest.actions.deep_trees_after_leaf_del
disk_after_tree_del = svntest.actions.deep_trees_after_tree_del
-if svntest.main.wc_is_singledb(''):
- disk_after_tree_del_no_ci = svntest.wc.State('', {
- 'F' : Item(),
- 'D' : Item(),
- 'DF' : Item(),
- 'DD' : Item(),
- 'DDF' : Item(),
- 'DDD' : Item(),
- })
-else:
- disk_after_tree_del_no_ci = svntest.wc.State('', {
- 'F' : Item(),
- 'D/D1' : Item(),
- 'DF/D1' : Item(),
- 'DD/D1/D2' : Item(),
- 'DDF/D1/D2' : Item(),
- 'DDD/D1/D2/D3' : Item(),
- })
-
deep_trees_conflict_output = svntest.actions.deep_trees_conflict_output
j = os.path.join
@@ -1056,7 +1037,14 @@ def tree_conflicts_on_merge_no_local_ci_
expected_output = deep_trees_conflict_output
- expected_disk = disk_after_tree_del_no_ci
+ expected_disk = svntest.wc.State('', {
+ 'F' : Item(),
+ 'D/D1' : Item(),
+ 'DF/D1' : Item(),
+ 'DD/D1/D2' : Item(),
+ 'DDF/D1/D2' : Item(),
+ 'DDD/D1/D2/D3' : Item(),
+ })
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1102,7 +1090,14 @@ def tree_conflicts_on_merge_no_local_ci_
expected_output = deep_trees_conflict_output
- expected_disk = disk_after_tree_del_no_ci
+ expected_disk = svntest.wc.State('', {
+ 'F' : Item(),
+ 'D/D1' : Item(),
+ 'DF/D1' : Item(),
+ 'DD/D1/D2' : Item(),
+ 'DDF/D1/D2' : Item(),
+ 'DDD/D1/D2/D3' : Item(),
+ })
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1253,7 +1248,14 @@ def tree_conflicts_on_merge_no_local_ci_
expected_output = deep_trees_conflict_output
- expected_disk = disk_after_tree_del_no_ci
+ expected_disk = svntest.wc.State('', {
+ 'F' : Item(),
+ 'D/D1' : Item(),
+ 'DF/D1' : Item(),
+ 'DD/D1/D2' : Item(),
+ 'DDF/D1/D2' : Item(),
+ 'DDD/D1/D2/D3' : Item(),
+ })
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),