Author: julianfoad
Date: Thu Mar 14 18:50:23 2013
New Revision: 1456612
URL: http://svn.apache.org/r1456612
Log:
* subversion/svn/cl.h,
subversion/svn/conflict-callbacks.c
(svn_cl__conflict_func_interactive): Move all of the documentation to the
declaration.
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=1456612&r1=1456611&r2=1456612&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Thu Mar 14 18:50:23 2013
@@ -344,10 +344,16 @@ svn_cl__get_conflict_func_interactive_ba
void *cancel_baton,
apr_pool_t *result_pool);
-/* A conflict-resolution callback which prompts the user to choose
- one of the 3 fulltexts, edit the merged file on the spot, or just
- skip the conflict (to be resolved later).
- Implements @c svn_wc_conflict_resolver_func_t. */
+/* A callback capable of doing interactive conflict resolution.
+
+ The BATON must come from svn_cl__get_conflict_func_interactive_baton().
+ Resolves based on the --accept option if one was given to that function,
+ otherwise prompts the user to choose one of the three fulltexts, edit
+ the merged file on the spot, or just skip the conflict (to be resolved
+ later), among other options.
+
+ Implements svn_wc_conflict_resolver_func2_t.
+ */
svn_error_t *
svn_cl__conflict_func_interactive(svn_wc_conflict_result_t **result,
const svn_wc_conflict_description2_t *desc,
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1456612&r1=1456611&r2=1456612&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Mar 14 18:50:23
2013
@@ -971,8 +971,6 @@ handle_obstructed_add(svn_wc_conflict_re
return SVN_NO_ERROR;
}
-/* Implement svn_wc_conflict_resolver_func2_t; resolves based on
- --accept option if given, else by prompting. */
svn_error_t *
svn_cl__conflict_func_interactive(svn_wc_conflict_result_t **result,
const svn_wc_conflict_description2_t *desc,
