Author: stsp
Date: Sat Oct 22 11:17:43 2011
New Revision: 1187692
URL: http://svn.apache.org/viewvc?rev=1187692&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(close_file): In the case where symlink becomes a tree-conflict victim,
the nature of the conflict is already known, so replace the call to
check_tree_conflict() with a direct call to create_tree_conflict(),
as suggested by a comment (and remove said comment).
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=1187692&r1=1187691&r2=1187692&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sat Oct 22 11:17:43
2011
@@ -4293,15 +4293,12 @@ close_file(void *file_baton,
fb->obstruction_found = TRUE;
fb->add_existed = FALSE;
- /* ### Performance: We should just create the conflict here, without
- ### verifying again */
- SVN_ERR(check_tree_conflict(&tree_conflict, eb, fb->local_abspath,
- svn_wc__db_status_added,
- svn_kind_file, TRUE,
- svn_wc_conflict_action_add,
- svn_node_file, fb->new_relpath, NULL,
- scratch_pool, scratch_pool));
- SVN_ERR_ASSERT(tree_conflict != NULL);
+ SVN_ERR(create_tree_conflict(&tree_conflict, eb,
+ fb->local_abspath,
+ svn_wc_conflict_reason_added,
+ svn_wc_conflict_action_add,
+ svn_node_file, fb->new_relpath,
+ scratch_pool, scratch_pool));
SVN_ERR(svn_wc__db_op_set_tree_conflict(eb->db,
fb->local_abspath,
tree_conflict,
