subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1357902 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Date Thu, 05 Jul 2012 20:51:55 GMT
Author: rhuijben
Date: Thu Jul  5 20:51:54 2012
New Revision: 1357902

URL: http://svn.apache.org/viewvc?rev=1357902&view=rev
Log:
During update a deleted node is not replaced until close_file or
close_directory is called to add the replacement, so we can safely
delay the updating of the tree conflict.

* subversion/libsvn_wc/update_editor.c
  (add_directory,
   add_file): Don't add the tree conflict here. Store it for a later install
     instead.

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=1357902&r1=1357901&r2=1357902&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Jul  5 20:51:54 2012
@@ -2105,17 +2105,6 @@ add_directory(const char *path,
                                         reason, svn_wc_conflict_action_replace,
                                         db->pool, db->pool));
 
-          /* Node does not pre-exist so no original location */
-          if (eb->switch_relpath)
-            SVN_ERR(svn_wc__conflict_skel_set_op_switch(tree_conflict, NULL,
-                                                        db->pool, db->pool));
-          else
-            SVN_ERR(svn_wc__conflict_skel_set_op_update(tree_conflict, NULL,
-                                                        db->pool, db->pool));
-
-          SVN_ERR(svn_wc__db_op_mark_conflict(eb->db, db->local_abspath,
-                                              tree_conflict, NULL, db->pool));
-
           /* And now stop checking for conflicts here and just perform
              a shadowed update */
           tree_conflict = NULL; /* No direct notification */
@@ -3285,17 +3274,6 @@ add_file(const char *path,
                                         reason, svn_wc_conflict_action_replace,
                                         fb->pool, fb->pool));
 
-          /* Node does not pre-exist so no original location */
-          if (eb->switch_relpath)
-            SVN_ERR(svn_wc__conflict_skel_set_op_switch(tree_conflict, NULL,
-                                                        fb->pool, fb->pool));
-          else
-            SVN_ERR(svn_wc__conflict_skel_set_op_update(tree_conflict, NULL,
-                                                        fb->pool, fb->pool));
-
-          SVN_ERR(svn_wc__db_op_mark_conflict(eb->db, fb->local_abspath,
-                                              tree_conflict, NULL, fb->pool));
-
           /* And now stop checking for conflicts here and just perform
              a shadowed update */
           tree_conflict = NULL; /* No direct notification */



Mime
View raw message