Skip to content

Fix Google Docs archive false conflict - #205

Merged
mohammedahmed18 merged 1 commit into
mainfrom
fix/google-docs-archive-version-conflict
Aug 18, 2026
Merged

Fix Google Docs archive false conflict#205
mohammedahmed18 merged 1 commit into
mainfrom
fix/google-docs-archive-version-conflict

Conversation

@mohammedahmed18

Copy link
Copy Markdown
Collaborator

Summary

  • Allow Google Docs entity archive pushes to pass precondition checks when only the Drive numeric version counter changed.
  • Keep the guard tied to unchanged Drive modified time and unchanged Docs revision, so real remote edits still conflict.
  • Add an archive-specific regression test for the RemoteMovedDuringPush false conflict.

Test Plan

  • cargo fmt --check
  • git diff --check
  • cargo test -p locality-google-docs connector::tests::concurrency_allows_drive_version_only_drift_for_entity_archive -- --exact
  • cargo test -p locality-google-docs connector::tests::apply_rejects_stale_docs_revision_precondition_without_writing -- --exact
  • cargo test -p locality-google-docs

@vercel

vercel Bot commented Aug 18, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
locality Ready Ready Preview Aug 18, 2026 11:53am

@mohammedahmed18
mohammedahmed18 merged commit 334ba6d into main Aug 18, 2026
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant