You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/06/22 15:19:10 UTC
svn commit: r956880 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Tue Jun 22 13:19:10 2010
New Revision: 956880
URL: http://svn.apache.org/viewvc?rev=956880&view=rev
Log:
Delete node via wc-db operation instead of by updating via entries.
* subversion/libsvn_wc/update_editor.c
(close_file): Use svn_wc__db_temp_op_delete() for delete.
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=956880&r1=956879&r2=956880&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Jun 22 13:19:10 2010
@@ -4987,15 +4987,7 @@ close_file(void *file_baton,
that tree. We need to schedule this file for deletion. */
if (fb->dir_baton->in_deleted_and_tree_conflicted_subtree && fb->adding_file)
{
- /* ### temporary hack. we should simply write a WORKING_NODE. */
-
- svn_wc_entry_t tmp_entry;
-
- tmp_entry.schedule = svn_wc_schedule_delete;
- SVN_ERR(svn_wc__entry_modify(eb->db, fb->local_abspath,
- svn_node_file,
- &tmp_entry, SVN_WC__ENTRY_MODIFY_SCHEDULE,
- pool));
+ SVN_ERR(svn_wc__db_temp_op_delete(eb->db, fb->local_abspath, pool));
}
/* If this file was locally-added and is now being added by the update, we