Author: philip
Revision: 991599
Modified property: svn:log
Modified: svn:log at Wed Sep 1 17:16:08 2010
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Sep 1 17:16:08 2010
@@ -1,6 +1,8 @@
Fix merge_tests 29. When merge adds a directory its children no longer
show as status 'A', and so when committing such a directory the children
-are no longer explicitly added.
+are no longer explicitly added. So the status output has changed but it's
+doing the right thing and so should be a PASS.
* subversion/tests/cmdline/merge_tests.py
(merge_dir_replace): Adjust expected outputs.
+ (test_list): Mark merge_dir_replace PASS.
