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 D7D1A10FFC for ; Mon, 10 Feb 2014 20:07:06 +0000 (UTC) Received: (qmail 6652 invoked by uid 500); 10 Feb 2014 20:06:05 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 5588 invoked by uid 500); 10 Feb 2014 20:05:28 -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 4657 invoked by uid 99); 10 Feb 2014 20:05:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 20:05:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 277EB922685; Mon, 10 Feb 2014 20:05:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benoitc@apache.org To: commits@couchdb.apache.org Date: Mon, 10 Feb 2014 20:05:29 -0000 Message-Id: <0676da56310a484891ff6898c5177960@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] couch commit: updated refs/remotes/origin/import to 09c6556 [squash] to somewhere, I dunno Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/cadc7e63 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/cadc7e63 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/cadc7e63 Branch: refs/remotes/origin/import Commit: cadc7e6305c3b5487dd007436de36fc4499f65d9 Parents: f37ad2b Author: Robert Newson Authored: Tue Mar 12 12:18:00 2013 -0500 Committer: Paul J. Davis Committed: Tue Feb 4 17:03:25 2014 -0600 ---------------------------------------------------------------------- src/couch_db_updater.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/cadc7e63/src/couch_db_updater.erl ---------------------------------------------------------------------- diff --git a/src/couch_db_updater.erl b/src/couch_db_updater.erl index 4fe6073..b8e150c 100644 --- a/src/couch_db_updater.erl +++ b/src/couch_db_updater.erl @@ -306,11 +306,11 @@ handle_info({'DOWN', Ref, _, _, Reason}, #db{fd_monitor=Ref, name=Name} = Db) -> code_change(_OldVsn, State, _Extra) -> {ok, State}. -merge_updates([[{_,#doc{id=X}}|_]=A|RestA], [[{_,#doc{id=X}}|_]=B|RestB]) -> +merge_updates([[{_,{#doc{id=X},_}}|_]=A|RestA], [[{_,{#doc{id=X},_}}|_]=B|RestB]) -> [A++B | merge_updates(RestA, RestB)]; -merge_updates([[{_,#doc{id=X}}|_]|_]=A, [[{_,#doc{id=Y}}|_]|_]=B) when X < Y -> +merge_updates([[{_,{#doc{id=X},_}}|_]|_]=A, [[{_,{#doc{id=Y},_}}|_]|_]=B) when X < Y -> [hd(A) | merge_updates(tl(A), B)]; -merge_updates([[{_,#doc{id=X}}|_]|_]=A, [[{_,#doc{id=Y}}|_]|_]=B) when X > Y -> +merge_updates([[{_,{#doc{id=X},_}}|_]|_]=A, [[{_,{#doc{id=Y},_}}|_]|_]=B) when X > Y -> [hd(B) | merge_updates(A, tl(B))]; merge_updates([], RestB) -> RestB;