Author: julianfoad
Date: Thu May 5 13:08:38 2011
New Revision: 1099778
URL: http://svn.apache.org/viewvc?rev=1099778&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(read_all_tree_conflicts): Fix the doc string.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1099778&r1=1099777&r2=1099778&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu May 5 13:08:38 2011
@@ -4220,9 +4220,8 @@ svn_wc__db_revert_list_notify(svn_wc_not
}
-/* Set *TREE_CONFLICT_DATA to a string describing any tree conflicts on
- immediate children of WCROOT+LOCAL_RELPATH. The format of the string is as
- produced by svn_wc__write_tree_conflicts(). */
+/* Like svn_wc__db_op_read_all_tree_conflicts(), but with WCROOT+LOCAL_RELPATH
+ instead of DB+LOCAL_ABSPATH. */
static svn_error_t *
read_all_tree_conflicts(apr_hash_t **tree_conflicts,
svn_wc__db_wcroot_t *wcroot,
