You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/06/24 06:00:46 UTC
svn commit: r1495921 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_wc/update_editor.c
Author: svn-role
Date: Mon Jun 24 04:00:46 2013
New Revision: 1495921
URL: http://svn.apache.org/r1495921
Log:
Merge r1495850 from trunk:
* r1495850
Use the correct baton in a callback API.
Justification:
Causes a crash in TSVN reported by multiple users.
See: http://svn.haxx.se/dev/archive-2013-06/0543.shtml
Votes:
+1: lgo, danielsh, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1495850
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1495921&r1=1495920&r2=1495921&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jun 24 04:00:46 2013
@@ -175,11 +175,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1495850
- Use the correct baton in a callback API.
- Justification:
- Causes a crash in TSVN reported by multiple users.
- See: http://svn.haxx.se/dev/archive-2013-06/0543.shtml
- Votes:
- +1: lgo, danielsh, stefan2
-
Modified: subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c?rev=1495921&r1=1495920&r2=1495921&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c Mon Jun 24 04:00:46 2013
@@ -2907,7 +2907,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