diff --git a/src/org/openstreetmap/josm/data/osm/DataSetMerger.java b/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
index 4306158782..93e814f6d0 100644
|
a
|
b
|
import org.openstreetmap.josm.data.conflict.ConflictCollection;
|
| 20 | 20 | import org.openstreetmap.josm.gui.progress.ProgressMonitor; |
| 21 | 21 | import org.openstreetmap.josm.tools.CheckParameterUtil; |
| 22 | 22 | import org.openstreetmap.josm.tools.JosmRuntimeException; |
| | 23 | import org.openstreetmap.josm.tools.Logging; |
| 23 | 24 | |
| 24 | 25 | /** |
| 25 | 26 | * A dataset merger which takes a target and a source dataset and merges the source data set |
| … |
… |
public class DataSetMerger {
|
| 289 | 290 | // found a corresponding target, remember it |
| 290 | 291 | mergedMap.put(source.getPrimitiveId(), target.getPrimitiveId()); |
| 291 | 292 | |
| 292 | | if (target.getVersion() > source.getVersion()) |
| | 293 | if (target.getVersion() > source.getVersion()) { |
| 293 | 294 | // target.version > source.version => keep target version |
| | 295 | if (Logging.isDebugEnabled()) { |
| | 296 | Logging.debug("{0}/{1} has an older version: {2} < {3}", source.getType().getAPIName(), source.getOsmId(), source.getVersion(), target.getVersion()); |
| | 297 | } |
| 294 | 298 | return true; |
| | 299 | } |
| 295 | 300 | |
| 296 | 301 | boolean mergeFromSource = false; |
| 297 | 302 | boolean haveSameVersion = target.getVersion() == source.getVersion(); |