You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/01/23 22:43:23 UTC
svn commit: r1437754 - /subversion/trunk/subversion/libsvn_wc/conflicts.h
Author: julianfoad
Date: Wed Jan 23 21:43:23 2013
New Revision: 1437754
URL: http://svn.apache.org/viewvc?rev=1437754&view=rev
Log:
* subversion/libsvn_wc/conflicts.h
(svn_wc__conflict_read_text_conflict,
svn_wc__conflict_read_prop_conflict,
svn_wc__conflict_read_tree_conflict): Fix cross-references.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.h
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1437754&r1=1437753&r2=1437754&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Wed Jan 23 21:43:23 2013
@@ -288,10 +288,10 @@ svn_wc__conflict_read_info(svn_wc_operat
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Reads back the original data stored by svn_wc__conflict_add_text_conflict()
+/* Reads back the original data stored by svn_wc__conflict_skel_add_text_conflict()
* in CONFLICT_SKEL for a node in DB, WRI_ABSPATH.
*
- * Values as documented for svn_wc__conflict_add_text_conflict().
+ * Values as documented for svn_wc__conflict_skel_add_text_conflict().
*
* Output arguments can be NULL if the value is not necessary.
*
@@ -308,10 +308,10 @@ svn_wc__conflict_read_text_conflict(cons
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Reads back the original data stored by svn_wc__conflict_add_prop_conflict()
+/* Reads back the original data stored by svn_wc__conflict_skel_add_prop_conflict()
* in CONFLICT_SKEL for a node in DB, WRI_ABSPATH.
*
- * Values as documented for svn_wc__conflict_add_prop_conflict().
+ * Values as documented for svn_wc__conflict_skel_add_prop_conflict().
*
* Output arguments can be NULL if the value is not necessary
* Allocate the result in RESULT_POOL. Perform temporary allocations in
@@ -329,10 +329,10 @@ svn_wc__conflict_read_prop_conflict(cons
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Reads back the original data stored by svn_wc__conflict_add_tree_conflict()
+/* Reads back the original data stored by svn_wc__conflict_skel_add_tree_conflict()
* in CONFLICT_SKEL for a node in DB, WRI_ABSPATH.
*
- * Values as documented for svn_wc__conflict_add_tree_conflict().
+ * Values as documented for svn_wc__conflict_skel_add_tree_conflict().
*
* Output arguments can be NULL if the value is not necessary
* Allocate the result in RESULT_POOL. Perform temporary allocations in