Changeset 3377 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2010-07-19T20:03:44+02:00 (14 years ago)
Author:
mjulius
Message:

Don't set the modified flag when merging a semantically equal primitive.

If we merge an unmodified source primitive there should be no need to upload that to the server.

File:
1 edited

Legend:

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

    r3362 r3377  
    309309            conflicts.add(target,source);
    310310        } else {
    311             // clone from other, but keep the modified flag. mergeFrom will mainly copy
     311            // clone from other. mergeFrom will mainly copy
    312312            // technical attributes like timestamp or user information. Semantic
    313313            // attributes should already be equal if we get here.
    314314            //
    315315            target.mergeFrom(source);
    316             target.setModified(true);
    317316            objectsWithChildrenToMerge.add(source.getPrimitiveId());
    318317        }
Note: See TracChangeset for help on using the changeset viewer.