[ 
https://issues.apache.org/jira/browse/COUCHDB-902?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12981962#action_12981962
 ] 

Klaus Trainer commented on COUCHDB-902:
---------------------------------------

Bob, Adam, this one is an awesome solution! I've scrutinized it and haven't 
found any flaw in it.

What I like most about it, is that with it, couch_key_tree:merge/3 always 
returns a correct `conflicts | no_conflicts` flag.

If you can identify further test cases, we should surely include them. Anyway, 
I'd be fine with the bugfix and tests in your couchdb-902 branch.

Please tell me when you've prepared a patch. I'll then have a look at it once 
again.

> Attachments that have recovered from conflict do not accept attachments.
> ------------------------------------------------------------------------
>
>                 Key: COUCHDB-902
>                 URL: https://issues.apache.org/jira/browse/COUCHDB-902
>             Project: CouchDB
>          Issue Type: Bug
>          Components: Database Core
>         Environment: trunk
>            Reporter: Paul Joseph Davis
>            Priority: Critical
>         Attachments: 0001-Fix-COUCHDB-902.patch, couchdb-902-test-case.py
>
>
> Apparently if a document has been in a conflict, they will reject requests to 
> add an attachment with a conflict error.
> I've tracked this down to couch_db_updater.erl line 501, but I'm not too 
> familiar with this part of the code so I figured I'd fill out a ticket in 
> case anyone else can go through this more quickly than me.
> Sure would be nice if I could attach a file when I create an issue...

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.

Reply via email to