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/25 20:31:49 UTC
svn commit: r1438658 - in /subversion/trunk/subversion/svn: cl.h
conflict-callbacks.c
Author: julianfoad
Date: Fri Jan 25 19:31:49 2013
New Revision: 1438658
URL: http://svn.apache.org/viewvc?rev=1438658&view=rev
Log:
Improve doc strings for some conflict resolution functions.
* subversion/svn/cl.h
(svn_cl__get_conflict_func_postpone_baton,
svn_cl__conflict_func_postpone,
svn_cl__resolve_postponed_conflicts): Better doc strings.
* subversion/svn/conflict-callbacks.c
(svn_cl__conflict_func_postpone): Remove doc string from here since it is
in the header file.
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1438658&r1=1438657&r2=1438658&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Fri Jan 25 19:31:49 2013
@@ -355,13 +355,18 @@ svn_cl__conflict_func_interactive(svn_wc
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Create an return a baton for use with svn_cl__conflict_func_postpone(),
- * allocated in RESULT_POOL. */
+/* Create and return a baton for use with svn_cl__conflict_func_postpone()
+ * and svn_cl__resolve_postponed_conflicts(), allocated in RESULT_POOL.
+ */
void *
svn_cl__get_conflict_func_postpone_baton(apr_pool_t *result_pool);
/* A conflict-resolution callback which postpones all conflicts and
- * remembers conflicted paths in BATON. */
+ * remembers conflicted paths in BATON. BATON must have been obtained
+ * from svn_cl__get_conflict_func_postpone_baton().
+ *
+ * Implements svn_wc_conflict_resolver_func2_t.
+ */
svn_error_t *
svn_cl__conflict_func_postpone(svn_wc_conflict_result_t **result,
const svn_wc_conflict_description2_t *desc,
@@ -369,9 +374,12 @@ svn_cl__conflict_func_postpone(svn_wc_co
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Run the interactive conflict resolver, obtained internally from
- * svn_cl__get_conflict_func_interactive(), on any conflicted paths
- * stored in the BATON obtained from svn_cl__get_conflict_func_postpone(). */
+/* Perform conflict resolver on any conflicted paths stored in the BATON
+ * which was obtained from svn_cl__get_conflict_func_postpone_baton().
+ *
+ * The conflict resolution will be interactive if ACCEPT_WHICH is
+ * svn_cl__accept_unspecified.
+ */
svn_error_t *
svn_cl__resolve_postponed_conflicts(void *baton,
svn_depth_t depth,
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1438658&r1=1438657&r2=1438658&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Jan 25 19:31:49 2013
@@ -1060,8 +1060,6 @@ svn_cl__conflict_func_interactive(svn_wc
return SVN_NO_ERROR;
}
-/* Implement svn_wc_conflict_resolver_func2_t; postpones all conflicts
- * and remembers conflicted paths in BATON. */
svn_error_t *
svn_cl__conflict_func_postpone(svn_wc_conflict_result_t **result,
const svn_wc_conflict_description2_t *desc,