You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by lg...@apache.org on 2013/06/23 19:14:58 UTC
svn commit: r1495850 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: lgo
Date: Sun Jun 23 17:14:58 2013
New Revision: 1495850
URL: http://svn.apache.org/r1495850
Log:
Fix a crash in TSVN when receiving a property update on a directory with local
property modifications.
(See: http://svn.haxx.se/dev/archive-2013-06/0543.shtml)
* subversion/libsvn_wc/update_editor.c
(close_directory): Use eb->cancel_baton instead of eb->conflict_baton for the
cancel_baton parameter in the 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=1495850&r1=1495849&r2=1495850&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sun Jun 23 17:14:58 2013
@@ -2928,7 +2928,7 @@ close_directory(void *dir_baton,
eb->conflict_func,
eb->conflict_baton,
eb->cancel_func,
- eb->conflict_baton,
+ eb->cancel_baton,
scratch_pool));
/* Notify of any prop changes on this directory -- but do nothing if