From f492b663024a4f10c451b2cfebfade347a0fb318 Mon Sep 17 00:00:00 2001 From: Philip Martin Date: Thu, 19 Aug 2010 15:23:03 +0000 Subject: [PATCH] Make merge_tree_conflict.py 20 and 21 pass in single-db. A missing directory will have full metadata in single-db, so children also show as missing. * subversion/tests/cmdline/merge_tree_conflict_tests.py (tree_conflicts_merge_edit_onto_missing, (tree_conflicts_merge_del_onto_missing): Build sandbox, tweak expectations for single-db. * subversion/tests/cmdline/svntest/actions.py (deep_trees_run_tests_scheme_for_merge): Only build sandbox if not built. git-svn-id: http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline@987188 13f79535-47bb-0310-9956-ffa450edef68 --- svntest/actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/svntest/actions.py b/svntest/actions.py index e2aa799..a10d899 100644 --- a/svntest/actions.py +++ b/svntest/actions.py @@ -2713,7 +2713,8 @@ def deep_trees_run_tests_scheme_for_merge(sbox, greater_scheme, j = os.path.join - sbox.build() + if not sbox.is_built(): + sbox.build() wc_dir = sbox.wc_dir # 1) Create directories. -- 2.11.4.GIT