Repository navigation
[stable35] fix(sync): do not push or save the generated initial state on open - #9629
Merged
Merged
Conversation
Opening a file without a stored Yjs state applied the state generated from the markdown as a local change. It was pushed like an edit, which marked the document dirty, so closing the viewer or leaving the page saved the re-serialized markdown even though nothing was edited. This dropped trailing newlines and normalized the syntax of untouched files. Apply the initial state with the sync provider as origin. Every client generates the same state from the file content, and the provider sends it along with the first local change, as it sends everything the server does not have yet. Fixes: #9077 Signed-off-by: Jonas <jonas@freesources.org> Assisted-by: ClaudeCode:claude-opus-5-5
Only versions that were pushed but not saved yet marked the document as dirty. Changes made while offline were therefore not marked dirty: they were not kept in IndexedDB for recovery, and no conflict resolution was offered when the file changed meanwhile. Track whether the outbox holds a local update that was not pushed yet and include it in the dirty state. Push pending changes before saving, so the save includes them, and autosave versions that were pushed by a retry without an editor update. Signed-off-by: Jonas <jonas@freesources.org> Assisted-by: ClaudeCode:claude-opus-5-5
backportbot
Bot
requested review from
max-nextcloud,
mejo- and
silverkszlo
as code owners
November 17, 2026 10:38
mejo-
approved these changes
Nov 17, 2026
mejo-
enabled auto-merge
November 17, 2026 10:38
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
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 PR #9589