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 2012/07/05 23:04:10 UTC
svn commit: r1357913 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Thu Jul 5 21:04:10 2012
New Revision: 1357913
URL: http://svn.apache.org/viewvc?rev=1357913&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(close_file): Store a special-status-changed tree conflict in the common
conflict skel instead of directly storing the conflict skel in the db.
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=1357913&r1=1357912&r2=1357913&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Jul 5 21:04:10 2012
@@ -4271,25 +4271,26 @@ close_file(void *file_baton,
if (local_is_link != incoming_is_link)
{
- svn_skel_t *tree_conflict = NULL;
-
fb->shadowed = TRUE;
fb->obstruction_found = TRUE;
fb->add_existed = FALSE;
- SVN_ERR(create_tree_conflict(&tree_conflict, eb,
- fb->local_abspath,
+ if (!conflict_skel)
+ conflict_skel = svn_wc__conflict_skel_create(fb->pool);
+
+ SVN_ERR(svn_wc__conflict_skel_add_tree_conflict(
+ conflict_skel,
+ eb->db, fb->local_abspath,
svn_wc_conflict_reason_added,
svn_wc_conflict_action_add,
scratch_pool, scratch_pool));
- SVN_ERR(svn_wc__db_op_mark_conflict(eb->db,
- fb->local_abspath,
- tree_conflict, NULL,
- scratch_pool));
fb->already_notified = TRUE;
do_notification(eb, fb->local_abspath, svn_node_unknown,
svn_wc_notify_tree_conflict, scratch_pool);
+
+ /* The update will be applied to PRISTINE, but not to
+ the in-working copy node */
}
}