Author: rhuijben
Revision: 1356702
Modified property: svn:log
Modified: svn:log at Tue Jul 3 12:50:39 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Jul 3 12:50:39 2012
@@ -1,2 +1,8 @@
+Following up on r1355192, make sure we call the interactive conflict resolver
+from the update editor to stay compatible with the old api.
+
+Found by: philipm
+(with help from the swig ruby tests)
+
* subversion/libsvn_wc/update_editor.c
(close_file): Add missing call to svn_wc__conflict_invoke_resolver.
