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/tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'subversion/libsvn_fs_fs/tree.c') diff --git a/subversion/libsvn_fs_fs/tree.c b/subversion/libsvn_fs_fs/tree.c index 0047bef251fc..5893da22b0cb 100644 --- a/subversion/libsvn_fs_fs/tree.c +++ b/subversion/libsvn_fs_fs/tree.c @@ -2284,7 +2284,7 @@ svn_fs_fs__commit_txn(const char **conflict_p, if (ffd->pack_after_commit) { - SVN_ERR(svn_fs_fs__pack(fs, NULL, NULL, NULL, NULL, pool)); + SVN_ERR(svn_fs_fs__pack(fs, 0, NULL, NULL, NULL, NULL, pool)); } return SVN_NO_ERROR; -- cgit v1.2.3