You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jc...@apache.org on 2018/09/22 22:06:14 UTC
svn propchange: r1840997 - svn:log
Author: jcorvel
Revision: 1840997
Modified property: svn:log
Modified: svn:log at Sat Sep 22 22:06:14 2018
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Sep 22 22:06:14 2018
@@ -23,24 +23,24 @@ change will be backported to the recentl
* subversion/include/svn_client.h
(svn_client_conflict_option_get_moved_to_repos_relpath_candidates2,
- (svn_client_conflict_option_set_moved_to_repos_relpath): New.
+ svn_client_conflict_option_set_moved_to_repos_relpath2): New.
(svn_client_conflict_option_get_moved_to_repos_relpath_candidates,
- (svn_client_conflict_option_set_moved_to_repos_relpath): Deprecate.
+ svn_client_conflict_option_set_moved_to_repos_relpath): Deprecate.
(svn_client_conflict_option_get_moved_to_abspath_candidates2,
- (svn_client_conflict_option_set_moved_to_abspath): New.
+ svn_client_conflict_option_set_moved_to_abspath2): New.
(svn_client_conflict_option_get_moved_to_abspath_candidates,
- (svn_client_conflict_option_set_moved_to_abspath): Deprecate.
+ svn_client_conflict_option_set_moved_to_abspath): Deprecate.
* subversion/libsvn_client/conflicts.c
+ (svn_client_conflict_option_get_moved_to_repos_relpath_candidates2,
+ svn_client_conflict_option_set_moved_to_repos_relpath2): New.
(svn_client_conflict_option_get_moved_to_repos_relpath_candidates,
- (svn_client_conflict_option_set_moved_to_repos_relpath): New.
- (svn_client_conflict_option_get_moved_to_repos_relpath_candidates,
- (svn_client_conflict_option_set_moved_to_repos_relpath): Implement
+ svn_client_conflict_option_set_moved_to_repos_relpath): Implement
as a wrapper around the new API.
(svn_client_conflict_option_get_moved_to_abspath_candidates2,
- (svn_client_conflict_option_set_moved_to_abspath): New.
+ svn_client_conflict_option_set_moved_to_abspath2): New.
(svn_client_conflict_option_get_moved_to_abspath_candidates,
- (svn_client_conflict_option_set_moved_to_abspath): Implement as a
+ svn_client_conflict_option_set_moved_to_abspath): Implement as a
wrapper around the new API.
* subversion/svn/conflict-callbacks.c