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 2010/06/11 11:21:34 UTC
svn commit: r953618 - /subversion/trunk/subversion/libsvn_wc/props.c
Author: philip
Date: Fri Jun 11 09:21:33 2010
New Revision: 953618
URL: http://svn.apache.org/viewvc?rev=953618&view=rev
Log:
* subversion/libsvn_wc/props.c (svn_wc__merge_props): Remove unused variable.
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=953618&r1=953617&r2=953618&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Fri Jun 11 09:21:33 2010
@@ -1818,7 +1818,6 @@ svn_wc__merge_props(svn_wc_notify_state_
apr_pool_t *iterpool;
int i;
svn_boolean_t is_dir;
- const char *adm_abspath;
svn_skel_t *conflict_skel = NULL;
SVN_ERR_ASSERT(base_props != NULL);
@@ -1829,11 +1828,6 @@ svn_wc__merge_props(svn_wc_notify_state_
is_dir = (kind == svn_wc__db_kind_dir);
- if (is_dir)
- adm_abspath = local_abspath;
- else
- adm_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
-
if (!server_baseprops)
server_baseprops = base_props;