Import svn-1.8.4, which includes fixes for both security and merge

handling.

1 files changed, 2 insertions, 1 deletions

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);
 }