From commits-return-48681-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Sun Mar 25 06:00:11 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 450A818064F for ; Sun, 25 Mar 2018 06:00:11 +0200 (CEST) Received: (qmail 71307 invoked by uid 500); 25 Mar 2018 04:00:10 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 71297 invoked by uid 99); 25 Mar 2018 04:00:09 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Mar 2018 04:00:09 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 10A253A0096 for ; Sun, 25 Mar 2018 04:00:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1827688 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_fs_fs/cached_data.c Date: Sun, 25 Mar 2018 04:00:08 -0000 To: commits@subversion.apache.org From: svn-role@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180325040009.10A253A0096@svn01-us-west.apache.org> Author: svn-role Date: Sun Mar 25 04:00:08 2018 New Revision: 1827688 URL: http://svn.apache.org/viewvc?rev=1827688&view=rev Log: Merge the 1.9.x-issue4722 branch: * r1826272 Fix issue 4722: commits that fail when a file DELTA is a multiple of 16K. Justification: Commits fail with a false "Filesystem is corrupt" error. Branch: ^/subversion/branches/1.9.x-issue4722 Votes: +1: philip, stsp, stefan2 Modified: subversion/branches/1.9.x/ (props changed) subversion/branches/1.9.x/STATUS subversion/branches/1.9.x/subversion/libsvn_fs_fs/cached_data.c Propchange: subversion/branches/1.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Mar 25 04:00:08 2018 @@ -5,6 +5,7 @@ /subversion/branches/1.9.x-fix-fsfs:1796142-1796469 /subversion/branches/1.9.x-fsfs-pack-fixes:1759183-1770158 /subversion/branches/1.9.x-fsfs-rep-comparison:1717869-1739708 +/subversion/branches/1.9.x-issue4722:1826271-1827687 /subversion/branches/1.9.x-r1664664:1674265-1674433 /subversion/branches/1.9.x-r1667233:1673207-1673638 /subversion/branches/1.9.x-r1700215:1701365-1703825 Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1827688&r1=1827687&r2=1827688&view=diff ============================================================================== --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Sun Mar 25 04:00:08 2018 @@ -140,18 +140,9 @@ Veto-blocked changes: Approved changes: ================= - * r1826272 - Fix issue 4722: commits that fail when a file DELTA is a multiple of 16K. - Justification: - Commits fail with a false "Filesystem is corrupt" error. - Branch: ^/subversion/branches/1.9.x-issue4722 - Votes: - +1: philip, stsp, stefan2 - * r1823327 Performance: Make the 'info' command fast on old repository revisions. Justification: Performance was bad. Votes: +1: julianfoad, stsp, stefan2 - Modified: subversion/branches/1.9.x/subversion/libsvn_fs_fs/cached_data.c URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_fs/cached_data.c?rev=1827688&r1=1827687&r2=1827688&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/libsvn_fs_fs/cached_data.c (original) +++ subversion/branches/1.9.x/subversion/libsvn_fs_fs/cached_data.c Sun Mar 25 04:00:08 2018 @@ -2199,6 +2199,7 @@ svn_fs_fs__get_contents_from_file(svn_st next_rep.revision = rh->base_revision; next_rep.item_index = rh->base_item_index; next_rep.size = rh->base_length; + next_rep.expanded_size = rep->expanded_size; svn_fs_fs__id_txn_reset(&next_rep.txn_id); SVN_ERR(build_rep_list(&rb->rs_list, &rb->base_window,