Changeset 29627 in osm for applications
- Timestamp:
- 2013-06-06T02:33:33+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java
r29559 r29627 94 94 for (Node sourceNode : source.getNodes()) { 95 95 Node targetNode = (Node)getMergeTarget(sourceNode); 96 if (targetNode.isDeleted() && sourceNode.isIncomplete() 96 if (!targetNode.isDeleted()) { 97 newNodes.add(targetNode); 98 } else if (sourceNode.isIncomplete() 97 99 && !conflicts.hasConflictForMy(targetNode)) { 98 100 conflicts.add(new Conflict<OsmPrimitive>(targetNode, sourceNode, true)); … … 101 103 addChangeCommandIfNotEquals(targetNode,undeletedTargetNode); 102 104 } 103 newNodes.add(targetNode);104 105 } 105 106 Way newTarget = new Way(target);
Note:
See TracChangeset
for help on using the changeset viewer.