Author: stsp
Revision: 1619418
Modified property: svn:log
Modified: svn:log at Thu Aug 21 18:17:14 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Aug 21 18:17:14 2014
@@ -20,3 +20,8 @@ in cases where the victim is an obstruct
* subversion/tests/cmdline/tree_conflict_tests.py
(actual_only_node_behaviour): Output for 'none' type nodes has changed.
Adjust expected output accordingly.
+
+* subversion/tests/libsvn_wc/conflict-data-test.c
+ (test_read_write_tree_conflicts): Create on-disk files and directories
+ in the test working copy since they are now required for proper node
+ kind detection. Previously, this test was using wc-db data only.
