From 608944fa5a78d7f517c9c73a7ded6c130cc97b83 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Thu, 1 Dec 2016 07:45:05 +0000 Subject: Import subversion-1.9.5. This includes a security fix for a component that we do not build, and two potentially useful client side fixes for reintegrate merges and tree conflict handling. See CHANGES for full details. --- subversion/libsvn_fs_fs/caching.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'subversion/libsvn_fs_fs/caching.c') diff --git a/subversion/libsvn_fs_fs/caching.c b/subversion/libsvn_fs_fs/caching.c index 6775fab009f85..b54d69b3039a4 100644 --- a/subversion/libsvn_fs_fs/caching.c +++ b/subversion/libsvn_fs_fs/caching.c @@ -430,7 +430,7 @@ svn_fs_fs__initialize_caches(svn_fs_t *fs, svn_fs_fs__deserialize_dir_entries, sizeof(pair_cache_key_t), apr_pstrcat(pool, prefix, "DIR", SVN_VA_NULL), - SVN_CACHE__MEMBUFFER_DEFAULT_PRIORITY, + SVN_CACHE__MEMBUFFER_HIGH_PRIORITY, fs, no_handler, fs->pool, pool)); @@ -806,7 +806,7 @@ svn_fs_fs__initialize_txn_caches(svn_fs_t *fs, APR_HASH_KEY_STRING, apr_pstrcat(pool, prefix, "TXNDIR", SVN_VA_NULL), - 0, + SVN_CACHE__MEMBUFFER_HIGH_PRIORITY, fs, TRUE, pool, pool)); -- cgit v1.2.3