563443 - option 3 broken for merge choices

Status: VERIFIED FIXED

(Firefox :: Sync, defect)

Description

[Mike Connor [:mconnor]]

Attachment: s/wipeServer/wipeRemote/

This might be a dupe, I know Tracy or Tony mentioned this.

Comment 1

[Ed Lee :Mardak]

Comment on attachment 443172 [details] [diff] [review]
s/wipeServer/wipeRemote/

Seems like some users on the forum have been hitting this too.

Comment 2

[Mike Connor [:mconnor]]

http://hg.mozilla.org/labs/weave/rev/929eb1c66043

Comment 3

[Tracy Walker [:tracy]]

Tony and I were discussing bug 561520.  So that would likely be the dupe.

the question I posed in email was:
Let's say I have 3 machines (A, B, C) setup with account Z and they have all been syncing to each other through the service.    Then, on machine A, I clear all my data and choose to reset sync with option 3 (Replace all other devices with your local data).   What should happen to machines B and C the next time they sync?  Do they get automatically overwritten with the cleared data from machine A?  Or do they merge their data into that new reset cloud?  From the option description, I'd expect the former.

Comment 5

[Mike Connor [:mconnor]]

The expectation is that the contents of A are duplicated to all other machines.  They should wipe local data and download from the server.

Comment 6

[Tracy Walker [:tracy]]

This is not acting as expected in comment #5, as seen on 1.3b4

1) A and B are in sync.  On B, remove a bunch of bookmarks from the toolbar.
2) Reset sync on Client A with option 3, Replace all other devices with your local data. let sync complete.
3) Run sync on client B.

Tested results:
The bookmarks that were removed there are not restored by the sync.

Expected results:
The sync from client A should have restored the deleted bookmarks on client B.

Also,  further syncs of both machines A and B do not restore the deleted bookmarks.  The clients remain out of sync.

Comment 7

[Mike Connor [:mconnor]]

We haven't really changed the code that executes in that case, but that's a separate bug we should fix!

Comment 8

[Tracy Walker [:tracy]]

verified with 1.3b5