| commit | f492b663024a4f10c451b2cfebfade347a0fb318 | |
| author | Philip Martin <philip.martin@wandisco.com> | |
| Thu, 19 Aug 2010 15:23:03 +0000 (19 15:23 +0000) | ||
| committer | Philip Martin <philip.martin@wandisco.com> | |
| Thu, 19 Aug 2010 15:23:03 +0000 (19 15:23 +0000) | ||
| tree | 07a97ab5418bbda668ff43e5a7dad13c424cbbe0 | treesnapshot (tar.gz zip) |
| parent | 4edab4c192527942de9c06dfd9be9d50985d5e8f | commitdiff |
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
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 | diffblobblamehistory |