New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 890746 link

Starred by 1 user

Issue metadata

Status: Assigned
Owner:
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

Directory conflicts prefer local deletion over remote update

Project Member Reported by mastiz@chromium.org, Oct 1

Issue description

Steps to repro:
1. Enable sync on two devices with the same account.
2. Bookmark some page and wait until both devices are in sync.
3. Put device A offline, and delete the bookmark.
4. On device B, update the bookmark's title.
5. Wait until device B commits local changes (title update).
6. Bring device A online.

Expected outcome:
- Device A detects a conflict and resolves it as remote wins (update is preferred over deletion).

Actual outcome:
- Device A prefers the local deletion.

This is type-agnostic for directory datatypes (non-USS), as implemented here: https://cs.chromium.org/chromium/src/components/sync/engine_impl/conflict_resolver.cc?l=164&rcl=d609030c80ca0c8d2a883e2fd748648ceb8d9a2a

In USS, the default behavior differs, and undeletion wins: https://cs.chromium.org/chromium/src/components/sync/model/model_type_sync_bridge.cc?l=39&rcl=e46aa31140b2e6341183d454b39c38bfd440bb8e

 
Labels: -Pri-2 Pri-3

Sign in to add a comment