Improves situation on LiteCore #437#3349
Merged
adamcfraser merged 2 commits intomasterfrom Mar 2, 2018
Merged
Conversation
adamcfraser
requested changes
Mar 2, 2018
rest/blip_sync.go
Outdated
|
|
||
| // Don't send conflicting rev tree branches, just send the winning rev tree branch leaf revision + history. | ||
| // Otherwise, Couchbase Lite will non-deterministically choose an arbitrary branch as the winner and | ||
| // tombstone the other branch. See LiteCore #437. |
Collaborator
There was a problem hiding this comment.
I don't think the non-deterministic branch choosing is really the reason we want to set sendConflicts=false. It's more correct to say here that CBL 2.0 (and blip_sync) doesn't support branched revision trees, and so we only want to send the winning revision.
Contributor
Author
There was a problem hiding this comment.
I guess the angle I was taking was to try to scare anyone who decided to flip that to true on a whim to fix some other bug. At least, let them know the consequences. But yeah, I agree that's not the primary motivation, so I'll reword that and leave the link to the issue for further backstory.
adamcfraser
approved these changes
Mar 2, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After this Sync Gateway change, the situation for https://github.com/couchbase/couchbase-lite-core/issues/437 incrementally improved as described in: https://github.com/couchbase/couchbase-lite-core/issues/437#issuecomment-370039341
Before
proposeChangesendpointAfter