lib/model: Handle deleted-then-ignored files (fixes #3502) #3557
Conversation
This file contains 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
When files that were previously marked as deleted became ignored, we used to do nothing at all. This changes that behavior to set the Invalid bit (that we should rename to Ignored). This then becomes an update to other devices that they should not trust our knowledge about the file in question. Read this diff without whitespace... Tested by - creating a bunch of files on s1 - letting them sync to s2 - shutting down s2 - deleting the files on s1 and rescanning - adding the files to .stignore on s1 and rescanning - starting up s2 and letting it sync - observing the files are not deleted on s2, and it considers itself up to date.
|
Did you repro the actual removal/bug tho? |
|
Actually no, I just think that I understand it, so let me do that as well. |
|
Yes. The exact same procedure described above results in the files gone from s2, without this patch. |
|
@st-review merge |
st-review
pushed a commit
that referenced
this pull request
Sep 2, 2016
When files that were previously marked as deleted became ignored, we used to do nothing at all. This changes that behavior to set the Invalid bit (that we should rename to Ignored). This then becomes an update to other devices that they should not trust our knowledge about the file in question. Read this diff without whitespace... Tested by - creating a bunch of files on s1 - letting them sync to s2 - shutting down s2 - deleting the files on s1 and rescanning - adding the files to .stignore on s1 and rescanning - starting up s2 and letting it sync - observing the files are not deleted on s2, and it considers itself up to date. GitHub-Pull-Request: #3557
st-review
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Purpose
When files that were previously marked as deleted became ignored, we used to do nothing at all. This changes that behavior to set the Invalid bit (that we should rename to Ignored). This then becomes an update to other devices that they should not trust our knowledge about the file in question.
Read this diff without whitespace...
Testing
Tested by
to date.