You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/05/02 14:15:57 UTC
svn commit: r1098535 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: hwright
Date: Mon May 2 12:15:57 2011
New Revision: 1098535
URL: http://svn.apache.org/viewvc?rev=1098535&view=rev
Log:
* subversion/libsvn_client/merge.c
(merge_file_added): Remove an unused variable and assignment.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1098535&r1=1098534&r2=1098535&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon May 2 12:15:57 2011
@@ -1527,7 +1527,6 @@ merge_file_added(svn_wc_notify_state_t *
{
merge_cmd_baton_t *merge_b = baton;
apr_pool_t *subpool = svn_pool_create(merge_b->pool);
- const char *parent_abspath;
svn_node_kind_t kind;
int i;
apr_hash_t *file_props;
@@ -1606,8 +1605,6 @@ merge_file_added(svn_wc_notify_state_t *
}
}
- parent_abspath = svn_dirent_dirname(mine_abspath, scratch_pool);
-
SVN_ERR(svn_io_check_path(mine_abspath, &kind, subpool));
switch (kind)
{