fix(wopi): use fresh storage mtime for conflict detection and responses#5870
Open
elzody wants to merge 1 commit into
Open
fix(wopi): use fresh storage mtime for conflict detection and responses#5870elzody wants to merge 1 commit into
elzody wants to merge 1 commit into
Conversation
Assisted-by: ClaudeCode:claude-sonnet-4-6 Signed-off-by: Elizabeth Danzberger <elizabeth@elzody.dev>
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.
Resolves:
Target version:
mainSummary
Apparently, in some cases when multiple people are editing a document, especially in longer editing sessions, the
mtimeof the file in theoc_filecachetable can become out of sync (behind) what themtimeis on the file storage, leading to a conflict. Re-scanning files on an instance viaocc files:scanresolves the conflict as the file cache'smtimeis updated to match the storage's.I have not been able to reproduce the issue, but hopefully reading the
mtimefrom the storage itself helps instead of relying on a potentially outdated one. Additionally, it includes theLastModifiedTimein the conflict dialog.Assisted-by: ClaudeCode:claude-sonnet-4-6
Checklist