From 4123d5358ab3354cef7ba87d05f976380d59cf6e Mon Sep 17 00:00:00 2001 From: Alan Date: Thu, 20 Sep 2018 22:51:03 -0400 Subject: [PATCH] Update conflicts.html Fixed mis-placed curl headers for Content-Type:application/json --- draft/conflicts.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/draft/conflicts.html b/draft/conflicts.html index b7491ba..e3b7031 100644 --- a/draft/conflicts.html +++ b/draft/conflicts.html @@ -144,8 +144,8 @@

Working with Conflicts

> curl -X PUT $HOST/db/foo -d '{"count":1}' {"ok":true,"id":"foo","rev":"1-74620ecf527d29daaab9c2b465fbce66"} -> curl -X POST $HOST/_replicate -d '{"source":"db","target":"http://127.0.0.1:5984/db-replica"}' -{"ok":true,...,"docs_written":1,"doc_write_failures":0}]} -H "Content-Type: application/json" +> curl -X POST $HOST/_replicate -d '{"source":"db","target":"http://127.0.0.1:5984/db-replica"}' -H "Content-Type: application/json" +{"ok":true,...,"docs_written":1,"doc_write_failures":0}]}

We skip a bit of the output of the replication session (see Chapter 16, Replication for details). If you see "docs_written":1 and "doc_write_failures":0, our document made it over to db-replica. We now update the document to {"count":2} in db-replica. Note that we now need to include the correct _rev property. @@ -161,8 +161,8 @@

Working with Conflicts

> curl -X PUT $HOST/db/foo -d '{"count":3,"_rev":"1-74620ecf527d29daaab9c2b465fbce66"}' {"ok":true,"id":"foo","rev":"2-7c971bb974251ae8541b8fe045964219"} -> curl -X POST $HOST/_replicate -d '{"source":"db","target":"http://127.0.0.1:5984/db-replica"}' -{"ok":true,..."docs_written":1,"doc_write_failures":0}]} -H "Content-Type: application/json" +> curl -X POST $HOST/_replicate -d '{"source":"db","target":"http://127.0.0.1:5984/db-replica"}' -H "Content-Type: application/json" +{"ok":true,..."docs_written":1,"doc_write_failures":0}]}

To see that we have a conflict, we create a simple view in db-replica. The map function looks like this: