562515 - Reset sync option "Replace all data on this computer with your Weave data" is not handling local deletes correctly

Status: VERIFIED FIXED

(Firefox :: Sync, defect)

Description

[Tracy Walker [:tracy]]

Seen on 1.2.3 and 1.3.b2

STR:

0) with Weave data synced to cloud and client A ans client B synced to it...
1) remove a few bookmarks and/or other data from client A
2) In the account manager, Reset Sync
3) choose the option to: "Replace all data on this computer with your Weave data"
4) sync client B

tested results: 
after step 3) deleted items in step one remain gone
what's worse:
after step 4) those items area also deleted from client B

Expected results:
A restore of deleted items should occur on client A.
Overwrite local data from cloud should do nothing to the cloud data.

One of the most useful aspects of option 2 is to recover a local client from some hideous corruption.  With this bug, the corruption would be unknowingly propagated to other clients

Comment 1

[Ed Lee :Mardak]

Attachment: v1

Comment 2

[Ed Lee :Mardak]

http://hg.mozilla.org/labs/weave/rev/4331211e64cf
Clear out any changed ids when wiping the client to prevent delete records from getting uploaded for these items.

Comment 3

[Tracy Walker [:tracy]]

verified with 1.3b4

Comment 4

[Tracy Walker [:tracy]]

in-litmus?  We have a smoke for general case but not a BFT for deletes

Comment 5

[Ayan Shah[:ashah]]

Investigating this bug for being potential crossweave automation test case
candidate.

Comment 6

[Jonathan Griffin (:jgriffin)]

Added test for this as http://hg.mozilla.org/automation/crossweave/rev/05d1a3e547e1

Comment 7

[Tracy Walker [:tracy]]

removing in-litmus flag, it no longer exists