You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/02/01 10:21:15 UTC
svn commit: r1441352 - in /subversion/trunk/subversion/libsvn_client:
merge.c repos_diff.c
Author: philip
Date: Fri Feb 1 09:21:15 2013
New Revision: 1441352
URL: http://svn.apache.org/viewvc?rev=1441352&view=rev
Log:
* subversion/libsvn_client/merge.c
(find_nearest_ancestor): Remove unused variable.
* subversion/libsvn_client/repos_diff.c
(diff_state_absent): Remove unused function.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1441352&r1=1441351&r2=1441352&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Feb 1 09:21:15 2013
@@ -3264,7 +3264,6 @@ find_nearest_ancestor(const apr_array_he
const char *local_abspath)
{
int i;
- svn_client__merge_path_t *ancestor = NULL;
SVN_ERR_ASSERT_NO_RETURN(children_with_mergeinfo != NULL);
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1441352&r1=1441351&r2=1441352&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Fri Feb 1 09:21:15 2013
@@ -1318,22 +1318,6 @@ struct diff_notify_baton_t
apr_hash_t *absent_relpaths;
};
-static svn_error_t *
-diff_state_absent(const char *relpath,
- void *state_baton,
- apr_pool_t *scratch_pool)
-{
- struct diff_notify_baton_t *dnb = state_baton;
-
- if (dnb->absent_relpaths)
- apr_hash_set(dnb->absent_relpaths,
- apr_pstrdup(apr_hash_pool_get(dnb->absent_relpaths), relpath),
- APR_HASH_KEY_STRING,
- "");
-
- return SVN_NO_ERROR;
-}
-
/* Create a repository diff editor and baton. */
svn_error_t *
svn_client__get_diff_editor2(const svn_delta_editor_t **editor,