488922 - Treat bookmarks restore specially

Status: VERIFIED FIXED

(Firefox :: Sync, defect, P1)

Description

[Dan Mills [:thunder]]

We should listen to the bookmarks-restore-begin event and ignore bookmarks tracker events, then in bookmarks-restore-success/finished start listening to events again and reset the last-sync timestamp (to make the next sync an initial merge).

We could also consider showing some UI asking the user if they want to restore to other machines vs merge.

Comment 1

[sample1423]

As of the moment, adding a second computer to sync with Weave causes remote bookmarks to be added to local bookmarks rather than replace or merge.

Functionality should resemble that of Zotero or Dreamweaver, where there is clear control over what side takes priority and the option to restore is there.

Comment 2

[Dan Mills [:thunder]]

(In reply to comment #1)
> As of the moment, adding a second computer to sync with Weave causes remote
> bookmarks to be added to local bookmarks rather than replace or merge.
> 
> Functionality should resemble that of Zotero or Dreamweaver, where there is
> clear control over what side takes priority and the option to restore is there.

This is not related to this bug.  This bug is about what the Weave behavior should be when the user selects the option to restore a bookmarks backup in the Firefox UI.

FWIW, Weave always merges ATM.  There is an option to replace, but not during the initial set-up.  That is something we're looking to improve in future versions.

Comment 3

[Ed Lee :Mardak]

http://hg.mozilla.org/labs/weave/rev/85da39d13859
Add observers for bookmarks-restore-* and ignore changes during import and trigger a fresh start on success.