wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pick a canonical guid to keep in a way that all machines can agree without having all data -- "smaller" guid.

Browse Source
This commit is contained in:
Edward Lee 2009-08-31 17:51:26 -07:00
parent 994b05a7d1
commit f8541ddf2f
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
services/sync/modules/engines.js
View File

@ -370,6 +370,16 @@ SyncEngine.prototype = {
}
},
_deleteId: function _deleteId(id) {
this._tracker.removeChangedID(id);
// Remember this id to delete at the end of sync
if (this._delete.ids == null)
this._delete.ids = [id];
else
this._delete.ids.push(id);
},
// Reconciliation has three steps:
// 1) Check for the same item (same ID) on both the incoming and outgoing
// queues. This means the same item was modified on this profile and
@ -407,12 +417,16 @@ SyncEngine.prototype = {
this._log.trace("Reconcile step 3");
let dupeId = this._findDupe(item);
if (dupeId) {
// Change the local item GUID to the incoming one
this._store.changeItemID(dupeId, item.id);
// Remove outgoing changes of the original id any any that were just made
this._tracker.removeChangedID(dupeId);
this._tracker.removeChangedID(item.id);
// Stick with the canonical lower id, so convert the dupe to incoming
if (item.id < dupeId) {
this._store.changeItemID(dupeId, item.id);
this._deleteId(dupeId);
}
// The local dupe is the lower id, so pretend the incoming is for it
else {
this._deleteId(item.id);
item.id = dupeId;
}
this._store.cache.clear(); // because parentid refs will be wrong
}