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 2015/11/09 15:40:13 UTC
svn commit: r1713447 - in /subversion/branches/move-tracking-2/subversion:
include/private/svn_branch_impl.h libsvn_delta/branch.c
Author: julianfoad
Date: Mon Nov 9 14:40:13 2015
New Revision: 1713447
URL: http://svn.apache.org/viewvc?rev=1713447&view=rev
Log:
On the 'move-tracking-2' branch: Remove an old, unimplemented method.
* subversion/include/private/svn_branch_impl.h
(branch_state_v_payload_resolve_t): Delete.
(svn_branch_state_vtable_t): Delete it from the vtable.
* subversion/libsvn_delta/branch.c
(branch_state_payload_resolve): Delete.
(branch_state_create): Delete it from the vtable.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h?rev=1713447&r1=1713446&r2=1713447&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h Mon Nov 9 14:40:13 2015
@@ -189,11 +189,6 @@ typedef svn_error_t *(*branch_state_v_de
svn_branch_eid_t eid,
apr_pool_t *scratch_pool);
-typedef svn_error_t *(*branch_state_v_payload_resolve_t)(
- svn_branch_state_t *branch,
- svn_element_content_t *element,
- apr_pool_t *scratch_pool);
-
typedef svn_error_t *(*branch_state_v_purge_t)(
svn_branch_state_t *branch,
apr_pool_t *scratch_pool);
@@ -208,7 +203,6 @@ struct svn_branch_state_vtable_t
branch_state_v_copy_one_t copy_one;
branch_state_v_copy_tree_t copy_tree;
branch_state_v_delete_one_t delete_one;
- branch_state_v_payload_resolve_t payload_resolve;
branch_state_v_purge_t purge;
};
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1713447&r1=1713446&r2=1713447&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Mon Nov 9 14:40:13 2015
@@ -821,15 +821,6 @@ branch_state_copy_tree(svn_branch_state_
return SVN_NO_ERROR;
}
-/* An #svn_branch_state_t method. */
-static svn_error_t *
-branch_state_payload_resolve(svn_branch_state_t *branch,
- svn_element_content_t *element,
- apr_pool_t *scratch_pool)
-{
- return SVN_NO_ERROR;
-}
-
const char *
svn_branch_get_id(svn_branch_state_t *branch,
apr_pool_t *result_pool)
@@ -1338,7 +1329,6 @@ branch_state_create(const char *bid,
branch_state_copy_one,
branch_state_copy_tree,
branch_state_delete_one,
- branch_state_payload_resolve,
branch_state_purge,
};
svn_branch_state_t *b