You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/06/19 17:33:11 UTC
svn commit: r1494657 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: stsp
Date: Wed Jun 19 15:33:10 2013
New Revision: 1494657
URL: http://svn.apache.org/r1494657
Log:
Remove duplicate invocations of the conflict resolver from the update editor.
* subversion/libsvn_wc/update_editor.c
(mark_directory_edited, mark_file_edited): Don't invoke the conflict
resolver here, the close_file() and close_directory() functions take
care of this as of r1491868.
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=1494657&r1=1494656&r2=1494657&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Jun 19 15:33:10 2013
@@ -898,8 +898,6 @@ complete_conflict(svn_skel_t *conflict,
static svn_error_t *
mark_directory_edited(struct dir_baton *db, apr_pool_t *scratch_pool)
{
- struct edit_baton *eb = db->edit_baton;
-
if (db->edited)
return SVN_NO_ERROR;
@@ -923,16 +921,6 @@ mark_directory_edited(struct dir_baton *
db->edit_conflict, NULL,
scratch_pool));
- if (eb->conflict_func)
- SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, db->local_abspath,
- db->edit_conflict,
- NULL /* merge_options */,
- eb->conflict_func,
- eb->conflict_baton,
- eb->cancel_func,
- eb->cancel_baton,
- scratch_pool));
-
do_notification(db->edit_baton, db->local_abspath, svn_node_dir,
svn_wc_notify_tree_conflict, scratch_pool);
db->already_notified = TRUE;
@@ -947,8 +935,6 @@ mark_directory_edited(struct dir_baton *
static svn_error_t *
mark_file_edited(struct file_baton *fb, apr_pool_t *scratch_pool)
{
- struct edit_baton *eb = fb->edit_baton;
-
if (fb->edited)
return SVN_NO_ERROR;
@@ -971,16 +957,6 @@ mark_file_edited(struct file_baton *fb,
fb->edit_conflict, NULL,
scratch_pool));
- if (eb->conflict_func)
- SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, fb->local_abspath,
- fb->edit_conflict,
- NULL /* merge_options */,
- eb->conflict_func,
- eb->conflict_baton,
- eb->cancel_func,
- eb->cancel_baton,
- scratch_pool));
-
do_notification(fb->edit_baton, fb->local_abspath, svn_node_file,
svn_wc_notify_tree_conflict, scratch_pool);
fb->already_notified = TRUE;