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/03/14 17:46:21 UTC
svn commit: r922889 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Sun Mar 14 16:46:21 2010
New Revision: 922889
URL: http://svn.apache.org/viewvc?rev=922889&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(add_directory): When handling a local delete for a tree conflict, use
the db operation for delete instead of handling the delete via
svn_wc__entry_modify2().
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=922889&r1=922888&r2=922889&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sun Mar 14 16:46:21 2010
@@ -2924,25 +2924,7 @@ add_directory(const char *path,
entries. */
if (pb->in_deleted_and_tree_conflicted_subtree)
{
- svn_wc_entry_t tmp_entry;
- apr_uint64_t modify_flags = SVN_WC__ENTRY_MODIFY_SCHEDULE;
-
- tmp_entry.schedule = svn_wc_schedule_delete;
-
- /* Mark PATH as scheduled for deletion in its parent. */
- SVN_ERR(svn_wc__entry_modify2(eb->db, db->local_abspath,
- svn_node_dir, TRUE,
- &tmp_entry, modify_flags, pool));
-
- /* ### HACK: Remove the incomplete status or the next entry_modify2
- will move the incomplete status to WORKING_NODE */
- SVN_ERR(svn_wc__db_temp_op_set_base_incomplete(eb->db, db->local_abspath,
- FALSE, pool));
-
- /* Mark PATH's 'this dir' entry as scheduled for deletion. */
- SVN_ERR(svn_wc__entry_modify2(eb->db, db->local_abspath,
- svn_node_dir, FALSE,
- &tmp_entry, modify_flags, pool));
+ SVN_ERR(svn_wc__db_temp_op_delete(eb->db, db->local_abspath, pool));
}
/* If this add was obstructed by dir scheduled for addition without