diff options
| -rw-r--r-- | share/www/script/test/replication.js | 7 | ||||
| -rw-r--r-- | src/couchdb/couch_db.erl | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/share/www/script/test/replication.js b/share/www/script/test/replication.js index c9caa5ee..5c06dd4e 100644 --- a/share/www/script/test/replication.js +++ b/share/www/script/test/replication.js @@ -205,12 +205,15 @@ couchTests.replication = function(debug) { this.afterBA2 = function(dbA, dbB) { // open documents and include the conflict meta data - var docA = dbA.open("foo", {conflicts: true}); - var docB = dbB.open("foo", {conflicts: true}); + var docA = dbA.open("foo", {conflicts: true, deleted_conflicts: true}); + var docB = dbB.open("foo", {conflicts: true, deleted_conflicts: true}); // We should have no conflicts this time T(docA._conflicts === undefined) T(docB._conflicts === undefined); + + // They show up as deleted conflicts instead + T(docA._deleted_conflicts[0] == docB._deleted_conflicts[0]); }; } }; diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl index 33b4d542..522df808 100644 --- a/src/couchdb/couch_db.erl +++ b/src/couchdb/couch_db.erl @@ -822,7 +822,7 @@ doc_meta_info(#doc_info{high_seq=Seq,revs=[#rev_info{rev=Rev}|RestInfo]}, RevTre case lists:member(deleted_conflicts, Options) of false -> []; true -> - case [Rev1 || #rev_info{rev=Rev1,deleted=false} <- RestInfo] of + case [Rev1 || #rev_info{rev=Rev1,deleted=true} <- RestInfo] of [] -> []; DelConflictRevs -> [{deleted_conflicts, DelConflictRevs}] end |