CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-18 22:48:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix versions of childnodes when merging force_local

Browse Source
This commit is contained in:
Bryan Housel
2015-02-27 16:56:00 -05:00
parent 1cfc6ad69a
commit 2b3dfef5e7
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/merge_remote_changes.js
+6 -7
View File
@@ -80,15 +80,14 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph, formatUser
remoteNode = remoteGraph.hasEntity(id);
// restore wanted..
if (remoteNode && option === 'force_remote') {
updates.replacements.push(remoteNode);
} else if (localNode && option === 'force_local') {
updates.replacements.push(localNode);
if (option === 'force_remote') {
if (remoteNode) updates.replacements.push(remoteNode);
} else if (localNode && remoteNode) {
var targetNode = iD.Entity(localNode, { version: remoteNode.version });
targetNode = mergeLocation(remoteNode, targetNode);
if (conflicts.length !== ccount) break;
if (option !== 'force_local') {
targetNode = mergeLocation(remoteNode, targetNode);
if (conflicts.length !== ccount) break;
}
updates.replacements.push(targetNode);
}
}