You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2011/08/24 19:58:50 UTC

svn propchange: r1161046 - svn:log

Author: stsp
Revision: 1161046
Modified property: svn:log

Modified: svn:log at Wed Aug 24 17:58:50 2011
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Aug 24 17:58:50 2011
@@ -49,5 +49,7 @@ This is different from how normal copies
   (f_moves): ... this new set.
   (up_sw_file_mod_onto_del): Do not expect a tree conflict for nodes
    in the f_moves set. Adjust test description.
-  (up_sw_file_del_onto_mod, up_sw_dir_add_onto_add): Add the f_moves
-   set to expected tree conflicts. No functional change.
+  (up_sw_file_del_onto_mod, up_sw_dir_add_onto_add,
+   merge_file_mod_onto_not_file, merge_file_del_onto_not_same,
+   merge_file_del_onto_not_file): Add the f_moves set to expected tree
+   conflicts. No functional change.