You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2017/02/04 13:22:59 UTC
svn commit: r1781667 - /subversion/trunk/subversion/include/svn_client.h
Author: stsp
Date: Sat Feb 4 13:22:59 2017
New Revision: 1781667
URL: http://svn.apache.org/viewvc?rev=1781667&view=rev
Log:
Improve documentation of aconflict resolver API function.
* subversion/include/svn_client.h
(svn_client_conflict_option_set_moved_to_repos_relpath): Explain which
other functions are affected by calling this one.
Modified:
subversion/trunk/subversion/include/svn_client.h
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1781667&r1=1781666&r2=1781667&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Sat Feb 4 13:22:59 2017
@@ -4484,6 +4484,11 @@ svn_client_conflict_option_get_moved_to_
* @a preferred_move_target_idx must be a valid index into the list returned
* by svn_client_conflict_option_get_moved_to_repos_relpath_candidates().
*
+ * This function can be called multiple times.
+ * It affects the output of svn_client_conflict_tree_get_description() and
+ * svn_client_conflict_option_get_description(). Call these functions again
+ * to get updated descriptions containing the newly selected move target.
+ *
* @since New in 1.10.
*/
svn_error_t *