lib/model: Detect deleted RO items scanning on non-RO (fixes #6864) #6865
Conversation
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
calmh
approved these changes
Jul 30, 2020
imsodin
added a commit
to imsodin/syncthing
that referenced
this pull request
Aug 20, 2020
calmh
pushed a commit
that referenced
this pull request
Aug 21, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
The main change is fixing #6864 by checking on unchanged deleted items if the local flags changed and adjusting accordingly. Also resolving deleted, receive-only items that no-one else had was convoluted (and potentially resulted in duplicate db updates, which shouldn't do any harm though), so I refactored that too. And there's a unit test for #6864).