From 68301b10e52aedbf076b5b08303439d75c192e18 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 11 Nov 2013 01:00:29 +0000 Subject: Import svn-1.8.4, which includes fixes for both security and merge handling. --- subversion/libsvn_fs_base/fs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'subversion/libsvn_fs_base/fs.c') diff --git a/subversion/libsvn_fs_base/fs.c b/subversion/libsvn_fs_base/fs.c index bee921b..4ad9e6f 100644 --- a/subversion/libsvn_fs_base/fs.c +++ b/subversion/libsvn_fs_base/fs.c @@ -65,6 +65,8 @@ #include "../libsvn_fs/fs-loader.h" #include "private/svn_fs_util.h" +#include "private/svn_subr_private.h" + /* Checking for return values, and reporting errors. */ @@ -1427,7 +1429,7 @@ svn_fs_base__init(const svn_version_t *loader_version, return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL, _("Unsupported FS loader version (%d) for bdb"), loader_version->major); - SVN_ERR(svn_ver_check_list(base_version(), checklist)); + SVN_ERR(svn_ver_check_list2(base_version(), checklist, svn_ver_equal)); SVN_ERR(check_bdb_version()); SVN_ERR(svn_fs_bdb__init(common_pool)); -- cgit v1.1