Directory conflicts prefer local deletion over remote update |
|
Issue descriptionSteps 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 |
|
►
Sign in to add a comment |
|
Comment 1 by mastiz@chromium.org
, Dec 10