Author: hwright
Revision: 874240
Modified property: svn:log
Modified: svn:log at Wed Feb 16 16:54:14 2011
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Feb 16 16:54:14 2011
@@ -5,7 +5,7 @@ Below are all the pertinent parts of log
edited for grouping and to remove some irrelevant details of intermediate
steps.
-------------------------------------------------------------------------
+-------------------------------------------------------------------
* subversion/libsvn_wc/adm_ops.c
(resolve_conflict_on_entry): Do not clear tree conflicts that are recorded
@@ -16,7 +16,7 @@ steps.
(svn_wc_resolved_conflict4): Use an entries-walker function that visits
unversioned tree conflict victims as well as ordinary entries.
-------------------------------------------------------------------------
+-------------------------------------------------------------------
Allow sched-deleted nodes to be resolved (fixes update_tests.py 15).
@@ -38,7 +38,7 @@ Fix a crash in del_tree_conflict().
(svn_wc__del_tree_conflict):
Only write and run the log if LOG_ACCUM is not NULL.
-------------------------------------------------------------------------
+-------------------------------------------------------------------
Fix per-victim "resolved" on directory tree-conflict victims.
@@ -72,7 +72,7 @@ Fix per-victim "resolved" on directory t
svn_wc__tree_conflict_exists):
Comments, add "@since New in 1.6.".
-------------------------------------------------------------------------
+-------------------------------------------------------------------
Make the tree-conflict-enabled WC walker cope with an unversioned target.
@@ -81,7 +81,7 @@ Make the tree-conflict-enabled WC walker
(svn_wc__walk_entries_and_tc): Allow the target to be unversioned, and
allow adm_access to be null.
-------------------------------------------------------------------------
+-------------------------------------------------------------------
Fix the behaviour of "resolved" that descends into unversioned
tree-conflicts even if the depth doesn't allow that.
@@ -93,7 +93,7 @@ tree-conflicts even if the depth doesn't
descend into unversioned tree-conflicted children of a directory.
(svn_wc__walk_entries_and_tc): Supply TARGET and DEPTH to the baton.
-------------------------------------------------------------------------
+-------------------------------------------------------------------
Tests.
