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

Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/06 16:47:09 UTC

svn propchange: r1442563 - svn:log

Author: rhuijben
Revision: 1442563
Modified property: svn:log

Modified: svn:log at Wed Feb  6 15:47:09 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Feb  6 15:47:09 2013
@@ -9,3 +9,7 @@ checking and to help catch possible merg
   (record_update_delete): Stop recording as merged_abspath.
   (merge_file_deleted,
    merge_dir_deleted): Record delete roots.
+
+  (subtree_touched_by_merge): Check deleted paths.
+  (flag_subtrees_needing_mergeinfo): Check hash instead of wc_db.
+  (do_merge): Update baton usage.