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/05/12 17:59:23 UTC
svn commit: r943562 - /subversion/trunk/subversion/libsvn_wc/merge.c
Author: philip
Date: Wed May 12 15:59:23 2010
New Revision: 943562
URL: http://svn.apache.org/viewvc?rev=943562&view=rev
Log:
* subversion/libsvn_wc/merge.c
(svn_wc__internal_merge): Remove unused variable.
Modified:
subversion/trunk/subversion/libsvn_wc/merge.c
Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=943562&r1=943561&r2=943562&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Wed May 12 15:59:23 2010
@@ -1254,7 +1254,6 @@ svn_wc__internal_merge(svn_skel_t **work
apr_pool_t *pool = scratch_pool; /* ### temporary rename */
const char *working_abspath;
const char *detranslated_target_abspath;
- const char *dir_abspath;
svn_boolean_t is_binary = FALSE;
const svn_prop_t *mimeprop;
svn_skel_t *work_item;
@@ -1267,8 +1266,6 @@ svn_wc__internal_merge(svn_skel_t **work
*work_items = NULL;
- dir_abspath = svn_dirent_dirname(target_abspath, pool);
-
/* Sanity check: the merge target must be under revision control,
* unless the merge target is a copyfrom text, which lives in a
* temporary file and does not exist in ACTUAL yet. */