[ https://issues.apache.org/jira/browse/COUCHDB-902?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12981461#action_12981461 ]
Bob Dionne commented on COUCHDB-902: ------------------------------------ Klaus et. al., I think we found the crux of the matter. As you suspected, the merge_simple clause involving A < B reports conflicts even when no new conflicts are present and the merge is successful. Adding an attachment to an existing conflict situation just exposes the issue. Kocolosk found a nice simple solution[1] that runs all the tests including the new etap we added. See what you think and if you agree we can turn it into a patch. I'm going to add some more tests there while I'm at it. Cheers, Bob [1] https://github.com/bdionne/couchdb/commit/5e424d118615ca14ee5 > 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.