Author: stsp
Date: Mon Feb 15 11:04:04 2016
New Revision: 1730496
URL: http://svn.apache.org/viewvc?rev=1730496&view=rev
Log:
* subversion/include/svn_wc.h
(svn_wc_resolved_conflict5): Deprecate this function.
Modified:
subversion/trunk/subversion/include/svn_wc.h
Modified: subversion/trunk/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1730496&r1=1730495&r2=1730496&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Mon Feb 15 11:04:04 2016
@@ -5054,7 +5054,11 @@ svn_wc_remove_from_revision_control(svn_
* Temporary allocations will be performed in @a scratch_pool.
*
* @since New in 1.7.
+ * @deprecated Provided for backward compatibility with the 1.9 API.
+ * Use svn_client_conflict_text_resolve(), svn_client_conflict_prop_resolve(),
+ * and svn_client_conflict_tree_resolve() instead.
*/
+SVN_DEPRECATED
svn_error_t *
svn_wc_resolved_conflict5(svn_wc_context_t *wc_ctx,
const char *local_abspath,
