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/03 14:45:34 UTC
svn commit: r1356702 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Tue Jul 3 12:45:33 2012
New Revision: 1356702
URL: http://svn.apache.org/viewvc?rev=1356702&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(close_file): Add missing call to svn_wc__conflict_invoke_resolver.
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=1356702&r1=1356701&r2=1356702&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Jul 3 12:45:33 2012
@@ -4574,6 +4574,14 @@ close_file(void *file_baton,
all_work_items,
scratch_pool));
+ if (conflict_skel && eb->conflict_func)
+ SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, fb->local_abspath,
+ conflict_skel,
+ NULL /* merge_options */,
+ eb->conflict_func,
+ eb->conflict_baton,
+ scratch_pool));
+
/* Deal with the WORKING tree, based on updates to the BASE tree. */
if (fb->moved_to_abspath)