Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B4B3411B4C for ; Thu, 28 Aug 2014 12:11:47 +0000 (UTC) Received: (qmail 6510 invoked by uid 500); 28 Aug 2014 12:11:39 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 5906 invoked by uid 500); 28 Aug 2014 12:11:39 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 4718 invoked by uid 99); 28 Aug 2014 12:11:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 12:11:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC0A0A02BF4; Thu, 28 Aug 2014 12:11:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Aug 2014 12:12:19 -0000 Message-Id: In-Reply-To: <149709301f134b60b82ddbd5d3fa6544@git.apache.org> References: <149709301f134b60b82ddbd5d3fa6544@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/50] couch commit: updated refs/heads/master to 9d0ac7d Match the old ordering for attachments This affects when we're updating attachments and need to merge updated attachments onto a non-deleted document. The old code useda lists:map/2 where as the new code is a tail recursive approach. This just reverses the accumulator to match the same order as we had previously. Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/da2ba9d7 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/da2ba9d7 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/da2ba9d7 Branch: refs/heads/master Commit: da2ba9d7f52153dedcf949df2bae0ec80f937910 Parents: 83ba077 Author: Paul J. Davis Authored: Mon Aug 11 12:29:56 2014 -0500 Committer: Robert Newson Committed: Thu Aug 28 13:00:02 2014 +0100 ---------------------------------------------------------------------- src/couch_att.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/da2ba9d7/src/couch_att.erl ---------------------------------------------------------------------- diff --git a/src/couch_att.erl b/src/couch_att.erl index 347a8fd..e174c48 100644 --- a/src/couch_att.erl +++ b/src/couch_att.erl @@ -273,7 +273,7 @@ merge_stubs([Att | Rest], OnDisk, Merged) -> merge_stubs(Rest, OnDisk, [Att | Merged]) end; merge_stubs([], _, Merged) -> - {ok, Merged}. + {ok, lists:reverse(Merged)}. disk_info(_, []) ->