[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/heads/import Commit: cadc7e6305c3b5487dd007436de36fc4499f65d9 Parents: f37ad2b Author: Robert Newson <rnew...@apache.org> Authored: Tue Mar 12 12:18:00 2013 -0500 Committer: Paul J. Davis <paul.joseph.da...@gmail.com> 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;
