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:41:36 UTC
svn propchange: r989235 - svn:log
Author: julianfoad
Revision: 989235
Modified property: svn:log
Modified: svn:log at Wed Aug 25 17:41:36 2010
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Aug 25 17:41:36 2010
@@ -1,6 +1,8 @@
Correct the expectations in three tests in merge_tree_conflict_tests.py so
they pass in single-DB mode as well as multi-DB mode.
+[Reverted in r989249.]
+
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(disk_after_tree_del_no_ci): New variable, with a value conditional on
wc_is_singledb().