You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/04/08 16:10:12 UTC
svn commit: r1465646 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Mon Apr 8 14:10:12 2013
New Revision: 1465646
URL: http://svn.apache.org/r1465646
Log:
Follow-up to r1465610:
* subversion/libsvn_wc/wc_db_update_move.c
(bump_mark_tree_conflict): Remove now unused variables.
Found by: rhuijben
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1465646&r1=1465645&r2=1465646&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Apr 8 14:10:12 2013
@@ -2076,8 +2076,6 @@ bump_mark_tree_conflict(svn_wc__db_wcroo
const char *new_repos_relpath;
svn_revnum_t old_rev;
svn_revnum_t new_rev;
- const char *old_repos_url;
- const char *new_repos_url;
svn_node_kind_t old_kind;
svn_node_kind_t new_kind;
svn_wc_conflict_version_t *old_version;
@@ -2092,11 +2090,6 @@ bump_mark_tree_conflict(svn_wc__db_wcroo
scratch_pool, scratch_pool));
SVN_ERR(svn_wc__db_fetch_repos_info(&repos_root_url, &repos_uuid,
wcroot->sdb, repos_id, scratch_pool));
- new_repos_url = svn_uri_canonicalize(apr_pstrcat(scratch_pool,
- repos_root_url, "/",
- new_repos_relpath,
- (const char *)NULL),
- scratch_pool);
/* Read old (pre-update) information from the move destination node. */
SVN_ERR(svn_wc__db_depth_get_info(NULL, &old_kind, &old_rev,
@@ -2105,11 +2098,6 @@ bump_mark_tree_conflict(svn_wc__db_wcroo
wcroot, move_dst_op_root_relpath,
relpath_depth(move_dst_op_root_relpath),
scratch_pool, scratch_pool));
- old_repos_url = svn_uri_canonicalize(apr_pstrcat(scratch_pool,
- repos_root_url, "/",
- old_repos_relpath,
- (const char *)NULL),
- scratch_pool);
old_version = svn_wc_conflict_version_create2(
repos_root_url, repos_uuid, old_repos_relpath, old_rev,