From 2b3dfef5e7ce49fb32515a693311f6a670753058 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 27 Feb 2015 16:56:00 -0500 Subject: [PATCH] Fix versions of childnodes when merging force_local --- js/id/actions/merge_remote_changes.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/js/id/actions/merge_remote_changes.js b/js/id/actions/merge_remote_changes.js index c954fc59e..768c6089a 100644 --- a/js/id/actions/merge_remote_changes.js +++ b/js/id/actions/merge_remote_changes.js @@ -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); } }