Fixes for COUCHDB-188 fix

On conflict, keep using the current revision tree.
Issue noticed by Paul Davis. Thanks.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl
index 0b890fe2c..54531db39 100644
--- a/src/couchdb/couch_db_updater.erl
+++ b/src/couchdb/couch_db_updater.erl
@@ -597,7 +597,7 @@ merge_rev_trees(Limit, MergeConflicts, [NewDocs|RestDocsList],
                         {NewTree, OldDeleted};
                     true ->
                         send_result(Client, Ref, conflict),
-                        {NewTree, OldDeleted}
+                        {AccTree, OldDeleted}
                     end;
                 {NewTree, no_conflicts} when  AccTree == NewTree ->
                     % the tree didn't change at all
@@ -619,7 +619,7 @@ merge_rev_trees(Limit, MergeConflicts, [NewDocs|RestDocsList],
                         {NewTree2, OldDeleted};
                     true ->
                         send_result(Client, Ref, conflict),
-                        {NewTree, OldDeleted}
+                        {AccTree, OldDeleted}
                     end;
                 {NewTree, _} ->
                     {NewTree, NewDoc#doc.deleted}