Skip to content

Improves situation on LiteCore #437 #3349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamcfraser merged 2 commits into from
Mar 2, 2018
Merged

Improves situation on LiteCore #437 #3349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a7f9e
Improves situation on LiteCore #437
Mar 2, 2018
dc45d41
Reword comment
Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion rest/blip_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,14 @@ func (bh *blipHandler) sendChanges(sender *blip.Sender, params *subChangesParams
}
}()

// Don't send conflicting rev tree branches, just send the winning revision + history, since
// CBL 2.0 (and blip_sync) don't support branched revision trees. See LiteCore #437.
sendConflicts := false

bh.LogTo("Sync", "Sending changes since %v. User:%s", params.since(), bh.effectiveUsername)
options := db.ChangesOptions{
Since: params.since(),
Conflicts: true,
Conflicts: sendConflicts,
Continuous: bh.continuous,
ActiveOnly: bh.activeOnly,
Terminator: bh.blipSyncContext.terminator,
Expand Down