CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-22 19:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly restore new local childnodes when choosing "keep local"

Browse Source
This commit is contained in:
Bryan Housel
2015-04-30 13:31:22 -04:00
parent bff8266f19
commit 8eae273bde
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/id/actions/merge_remote_changes.js
View File

@@ -90,16 +90,17 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph, formatUser
remote = remoteGraph.hasEntity(id),
target;
if (!remote) continue;
if (option === 'force_remote' && remote.visible) {
if (option === 'force_remote' && remote && remote.visible) {
updates.replacements.push(remote);
}
if (option === 'force_local' && local) {
target = iD.Entity(local, { version: remote.version });
} else if (option === 'force_local' && local) {
target = iD.Entity(local);
if (remote && remote.visible) {
target = target.update({ version: remote.version });
}
updates.replacements.push(target);
}
if (option === 'safe' && local && remote) {
} else if (option === 'safe' && local && remote) {
target = iD.Entity(local, { version: remote.version });
if (remote.visible) {
target = mergeLocation(remote, target);