subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1356702 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Date Tue, 03 Jul 2012 12:45:34 GMT
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)



Mime
View raw message