Changeset 2634 in josm for trunk


Ignore:
Timestamp:
2009-12-14T16:05:18+01:00 (12 years ago)
Author:
mjulius
Message:

really fixes #4088 - Remove modified flag when merging downloaded data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

    r2626 r2634  
    330330        } else if (target.isModified() && ! source.isModified() && target.getVersion() == source.getVersion()) {
    331331            // target is same as source but target is modified
    332             // => keep target
     332            // => keep target and reset modified flag if target and source are semantically equal
     333            if (target.hasEqualSemanticAttributes(source)) {
     334                target.setModified(false);
     335            }
    333336        } else if (! target.hasEqualSemanticAttributes(source)) {
    334337            // target is modified and is not semantically equal with source. Can't automatically
Note: See TracChangeset for help on using the changeset viewer.