Repository navigation
[stable34] fix: don't silently drop outside changes (e.g. from external storage) - #9539
Merged
Merged
Conversation
backportbot
Bot
added
bug
5 tasks done
mejo-
changed the title
mejo-
force-pushed
the
backport/9530/stable34
branch
2 times, most recently
from
November 4, 2026 15:28
5f86a22 to
e540d52
Compare
mejo-
marked this pull request as ready for review
November 4, 2026 15:28
…extcloud Writes that bypass Nextcloud, e.g. directly on external storage, do not trigger the NodeWritten listeners, so a stored document and its yjs state were reused when the file was opened again, and the editor showed outdated content. When opening a session, compare the stored checksum with the current file. If it differs and the document has no unsaved changes, reset the document so the client loads the current file content. Documents with unsaved changes are kept so the conflict is raised on the next save. Refs: #9236 Signed-off-by: Jonas <jonas@freesources.org> Assisted-by: ClaudeCode:claude-opus-5-5
Since conflicts are no longer reported by the sync endpoint, a save rejected because the file changed outside of Text returned 409 with the outside content, but SaveService ignored it. The editor kept retrying silently and the changes were never saved. Emit a SAVE_COLLISION error so the conflict resolution dialog is shown. Refs: #9236 Signed-off-by: Jonas <jonas@freesources.org> Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: Jonas <jonas@freesources.org> Assisted-by: ClaudeCode:claude-opus-5-5
mejo-
force-pushed
the
backport/9530/stable34
branch
from
November 4, 2026 16:29
e540d52 to
5c54c07
Compare
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
…re unchanged On stable34, assertNoOutsideConflict() skipped the checksum comparison when the file cache's etag and mtime matched the document. Files changed directly on storage (e.g. external storage, filesystem_check_changes=0) keep their cached etag/mtime, so the change went undetected and was overwritten on save. Always compare the checksum, as stable35 does. Signed-off-by: Jonas <jonas@freesources.org> Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
mejo-
approved these changes
Nov 4, 2026
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.
Backport of #9530
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.