diff options
| author | Robert Newson <robert.newson@gmail.com> | 2013-03-05 10:50:46 -0800 |
|---|---|---|
| committer | Robert Newson <robert.newson@gmail.com> | 2013-03-05 10:50:46 -0800 |
| commit | c296cae588d30081ac920e4fbc7c9fddc90bb1de (patch) | |
| tree | b7681928876d75f2428f82d905bb1b108ef10fad | |
| parent | 59a5b602713a78219b4a0a482fae644ac63df25c (diff) | |
| parent | 00bd7567e56e46b7739e74877b5916ff851f7e08 (diff) | |
| download | couchdb-c296cae588d30081ac920e4fbc7c9fddc90bb1de.tar.gz | |
Merge pull request #5 from cloudant/allow-conflict-resolution
Allow conflict resolution
| -rw-r--r-- | src/custodian/src/custodian.hrl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/custodian/src/custodian.hrl b/src/custodian/src/custodian.hrl index f4b054dc1..af662304b 100644 --- a/src/custodian/src/custodian.hrl +++ b/src/custodian/src/custodian.hrl @@ -6,6 +6,7 @@ <<"function(newDoc, oldDoc) { var i, range, node; if(newDoc['_id'].substring(0, 8) === \"_design/\") return; + if(newDoc['_deleted'] === true) return; if (!newDoc.by_node) { throw({forbidden: \"by_node is mandatory\"}); } |