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 2014/04/11 06:01:36 UTC
svn commit: r1586558 - in /subversion/branches/1.8.x: ./ STATUS
subversion/tests/libsvn_wc/conflict-data-test.c
Author: svn-role
Date: Fri Apr 11 04:01:36 2014
New Revision: 1586558
URL: http://svn.apache.org/r1586558
Log:
Merge r1481782 from trunk:
* r1481782
Fix problem in test suite by allocating buffer of the right size
Justification:
Reported to fail often when tracing memory problems.
Votes:
+1: rhuijben, stsp, philip
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/tests/libsvn_wc/conflict-data-test.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1481782
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1586558&r1=1586557&r2=1586558&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Apr 11 04:01:36 2014
@@ -386,13 +386,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1481782
- Fix problem in test suite by allocating buffer of the right size
- Justification:
- Reported to fail often when tracing memory problems.
- Votes:
- +1: rhuijben, stsp, philip
-
* r1570642, r1585686, r1586352
Fix memcached support.
Justification:
Modified: subversion/branches/1.8.x/subversion/tests/libsvn_wc/conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1586558&r1=1586557&r2=1586558&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/branches/1.8.x/subversion/tests/libsvn_wc/conflict-data-test.c Fri Apr 11 04:01:36 2014
@@ -740,7 +740,7 @@ test_prop_conflicts(const svn_test_opts_
svn_error_t *err;
const char *lock_abspath;
test_prop_conflict_baton_t *b = apr_pcalloc(pool, sizeof(*b));
- svn_wc_conflict_description2_t *desc = apr_pcalloc(pool, sizeof(*b));
+ svn_wc_conflict_description2_t *desc = apr_pcalloc(pool, sizeof(*desc));
SVN_ERR(svn_test__sandbox_create(&sbox, "test_prop_conflicts", opts, pool));