Merge lp:~jamesh/bindwood/update-after-remove into lp:bindwood
Proposed by
James Henstridge
Status: | Merged |
---|---|
Approved by: | James Henstridge |
Approved revision: | 43 |
Merged at revision: | 43 |
Proposed branch: | lp:~jamesh/bindwood/update-after-remove |
Merge into: | lp:bindwood |
Prerequisite: | lp:~jamesh/bindwood/log-to-file |
Diff against target: |
70 lines (+52/-0) 2 files modified
modules/sync.jsm (+13/-0) mozmill/tests/test_sync_from_couch.js (+39/-0) |
To merge this branch: | bzr merge lp:~jamesh/bindwood/update-after-remove |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Samuele Pedroni | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email: mp+52979@code.launchpad.net |
Commit message
When processing changes from CouchDB, ignore the update if the local item has been removed. The record in CouchDB will be removed in the second half of the synchronisation.
Description of the change
When pulling changes from CouchDB, we check to see if there is an existing local item for the document ID.
If the item has been deleted locally in the time since the last sync, we will find the item ID via the GUID->ID cache. This was causing errors when we tried to update the deleted local item.
This branch just ignores the update, on the assumption that the second half of the synchronisation will delete the item in CouchDB.
To post a comment you must log in.
makes sense, test pass