[stable-33.0] fix(file-provider): prevent data loss when parent folder moves during sync.#10172
Merged
Merged
Conversation
… sync. When a parent directory returns 404, children are no longer eagerly marked deleted — they may have moved with the parent. The deconfliction pass now includes newly discovered items, and items with pending uploads are protected from deletion in both the enumerator and recursive directory delete paths. Assisted-by: Claude:claude-sonnet-4-5 Signed-off-by: Camila Ayres <hello@camilasan.com>
Assisted-by: Claude:claude-sonnet-4-5 Signed-off-by: Camila Ayres <hello@camilasan.com>
backportbot
Bot
requested review from
camilasan,
i2h3,
mgallien and
nilsding
as code owners
mgallien
approved these changes
Jun 12, 2026
camilasan
approved these changes
Jun 12, 2026
Contributor
|
Artifact containing the AppImage: nextcloud-appimage-pr-10172.zip Digest: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
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
2 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.
Backport of PR #10134