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/01 04:30:08 UTC
svn commit: r1098209 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: hwright
Date: Sun May 1 02:30:08 2011
New Revision: 1098209
URL: http://svn.apache.org/viewvc?rev=1098209&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(delete_entry): Don't bother calculating a path we never use.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1098209&r1=1098208&r2=1098209&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sun May 1 02:30:08 2011
@@ -1678,11 +1678,6 @@ delete_entry(const char *path,
* a tree-conflict on a parent node. */
if (!pb->shadowed)
{
- const char *their_relpath = repos_relpath;
-
- if (eb->switch_relpath)
- their_relpath = svn_relpath_join(pb->new_relpath, base, scratch_pool);
-
SVN_ERR(check_tree_conflict(&tree_conflict, eb, local_abspath,
status, kind, TRUE,
svn_wc_conflict_action_delete, svn_node_none,