Ticket #21012: 21012.patch

File 21012.patch, 1.4 KB (added by taylor.smock, 3 years ago)
  • src/org/openstreetmap/josm/data/osm/DataSetMerger.java

    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;  
    2020import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2121import org.openstreetmap.josm.tools.CheckParameterUtil;
    2222import org.openstreetmap.josm.tools.JosmRuntimeException;
     23import org.openstreetmap.josm.tools.Logging;
    2324
    2425/**
    2526 * A dataset merger which takes a target and a source dataset and merges the source data set
    public class DataSetMerger {  
    289290        // found a corresponding target, remember it
    290291        mergedMap.put(source.getPrimitiveId(), target.getPrimitiveId());
    291292
    292         if (target.getVersion() > source.getVersion())
     293        if (target.getVersion() > source.getVersion()) {
    293294            // 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            }
    294298            return true;
     299        }
    295300
    296301        boolean mergeFromSource = false;
    297302        boolean haveSameVersion = target.getVersion() == source.getVersion();