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/21 06:00:39 UTC
svn commit: r1495280 - in /subversion/branches/1.8.x: ./ STATUS
subversion/tests/svn_test_fs.c
Author: svn-role
Date: Fri Jun 21 04:00:39 2013
New Revision: 1495280
URL: http://svn.apache.org/r1495280
Log:
Merge r1494342 from trunk:
* r1494342
C tests: support --compatible-version=1.8.
Justification:
Enable running the tests with --compatible-version
Votes:
+1: danielsh, rhuijben, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/tests/svn_test_fs.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1494342
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1495280&r1=1495279&r2=1495280&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Jun 21 04:00:39 2013
@@ -197,13 +197,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1494342
- C tests: support --compatible-version=1.8.
- Justification:
- Enable running the tests with --compatible-version
- Votes:
- +1: danielsh, rhuijben, stefan2
-
* r1495104
Handle unexpected HTTP status codes as errors instead of as SUCCESS codes
in ra_serf.
Modified: subversion/branches/1.8.x/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/svn_test_fs.c?rev=1495280&r1=1495279&r2=1495280&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/svn_test_fs.c (original)
+++ subversion/branches/1.8.x/subversion/tests/svn_test_fs.c Fri Jun 21 04:00:39 2013
@@ -33,6 +33,7 @@
#include "svn_fs.h"
#include "svn_path.h"
#include "svn_delta.h"
+#include "svn_hash.h"
#include "svn_test_fs.h"
@@ -81,8 +82,8 @@ make_fs_config(const char *fs_type,
fs_type);
if (server_minor_version)
{
- if (server_minor_version == 6)
- /* no SVN_FS_CONFIG_PRE_1_7_COMPATIBLE */;
+ if (server_minor_version == 6 || server_minor_version == 7)
+ svn_hash_sets(fs_config, SVN_FS_CONFIG_PRE_1_8_COMPATIBLE, "1");
else if (server_minor_version == 5)
apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_6_COMPATIBLE,
APR_HASH_KEY_STRING, "1");