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/svn/svn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'subversion/svn/svn.c') diff --git a/subversion/svn/svn.c b/subversion/svn/svn.c index 5432e8b..7ed7ed2 100644 --- a/subversion/svn/svn.c +++ b/subversion/svn/svn.c @@ -56,6 +56,7 @@ #include "private/svn_opt_private.h" #include "private/svn_cmdline_private.h" +#include "private/svn_subr_private.h" #include "svn_private_config.h" @@ -1640,7 +1641,7 @@ check_lib_versions(void) }; SVN_VERSION_DEFINE(my_version); - return svn_ver_check_list(&my_version, checklist); + return svn_ver_check_list2(&my_version, checklist, svn_ver_equal); } -- cgit v1.1