Mailing-List: contact user-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: user@couchdb.apache.org
Received-SPF: pass (athena.apache.org: domain of adam.kocoloski@gmail.com
 designates 74.125.46.30 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:from:to:in-reply-to:content-type
         :content-transfer-encoding:mime-version:subject:date:references
         :x-mailer;
        b=auzEbHtweLRLpkmHSYSNQOjAqIopoxr3jQTSaSaTC6f9hphjozFiGU8gCCY8ggzAOq
         btqrdSy2AhjXiR2ea7C5dOLffdOkY2tQv4TvxyOB0eugsv0YTyvR7yWEu4idURk+eIhB
         XK8zmJ8QFmmYR70HUpWChKGEj7GhQWtrzkWGI=
Message-Id: <BF91C4EF-D461-4EF6-B399-60AB20849E1B@gmail.com>
From: Adam Kocoloski <adam.kocoloski@gmail.com>
To: user@couchdb.apache.org
In-Reply-To: <20090128165433.GA14192@uk.tiscali.com>
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v930.3)
Subject: Re: Trouble with replication
Date: Wed, 28 Jan 2009 12:07:12 -0500
References: <20090128153026.GA12384@uk.tiscali.com>
 <6C6796D4-1766-4526-A9C1-A4872C935337@gmail.com>
 <20090128162332.GA13801@uk.tiscali.com>
 <20090128165433.GA14192@uk.tiscali.com>

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