Details
-
Bug
-
Status: Closed
-
Major
-
Resolution: Fixed
-
2.8.0
-
Security Level: Public
-
None
-
CBG Sprint 78
-
3
Description
resolveDocMerge extracts the previous local rev from the mutable conflict.localDocument. However, this may have been modified by the conflict resolver. As a result, conflict resolvers that return a modified localDocument (stripping out _rev) will result in an error like:
Error resolving conflict for <ud>mydoc</ud>: Attempted to tombstone active revision for doc (mydoc), but provided rev () doesn't match current rev(14-f9841ac5d3bfa186fbd6f52d1f747cd8)
Any code that works with Conflict after conflict resolution has run should treat it as mutated, and only use when appropriate (rev check for local/remote wins, and body for merge)
Attachments
Issue Links
- is triggering
-
-
- Closed
-
Activity
Automated transition triggered when ibsoln merged pull request #423 in GitHub -
| Resolution | Fixed [ 1 ] | |
| Status | Open [ 1 ] | Resolved [ 5 ] |
| Resolution | Fixed [ 1 ] | |
| Status | Resolved [ 5 ] | Reopened [ 4 ] |
| Required Mobile Fields |
Mandatory:
- CBL / SG Version: - SG Config: - Steps to Reproduce: - Actual Result: - Expected Result: - Logs : SGW LOGS: sgcollect info CBL LOGS: Logcat LOGS: for Android tickets - Github link for the code: - Jenkins job failure link: - Pytest Command - What is the last build this test passed: |
| Assignee | The One [ the one ] | Jacques Rascagneres [ jacques.rascagneres ] |
| Sprint | CBG Sprint 78 [ 1691 ] |
| Rank | Ranked lower |
| Status | Reopened [ 4 ] | In Progress [ 3 ] |
Automated transition triggered when Jacques Rascagneres created pull request #5118 in GitHub -
| Status | In Progress [ 3 ] | In Review [ 10107 ] |
| Resolution | Fixed [ 1 ] | |
| Status | In Review [ 10107 ] | Resolved [ 5 ] |
Build sync_gateway-3.0.0-301 contains sync_gateway commit e96fcbb with commit message:
CBG-1335: Use appropriate rev when utilizing a custom conflict resolver (#5118)
| Status | Resolved [ 5 ] | Closed [ 6 ] |
A new test should be written to exercise this - have a conflict resolver that results in a merge, and also mutates the value of local.rev and/or remote.rev, and ensure that the mutated revisions aren't used post-conflict resolution.