couchdb-user mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Adam Kocoloski <adam.kocolo...@gmail.com>
Subject Re: Trouble with replication
Date Wed, 28 Jan 2009 17:07:12 GMT
On Jan 28, 2009, at 11:54 AM, Brian Candler wrote:

> On Wed, Jan 28, 2009 at 04:23:32PM +0000, Brian Candler wrote:
>> I'll add what I've learned to the wiki.
>
> Added to http://wiki.apache.org/couchdb/How_to_replicate_a_database
>
> However the piece I'm missing is: what does the client have to do in  
> order
> to mark the conflict as resolved?
>
> Thanks,
>
> Brian.

Hi Brian, once your app layer is satisfied that it has resolved the  
conflict, just DELETE the conflict revision and replicate.  Couch  
actually keeps a separate list of deleted conflict revisions that you  
can view with "deleted_conflicts=true".

Thanks for updating the wiki docs.  Best, Adam



Mime
View raw message