Changeset 3377 in josm for trunk

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:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -309 +309 @@
             conflicts.add(target,source);
         } else {
-            // clone from other, but keep the modified flag. mergeFrom will mainly copy
+            // clone from other. mergeFrom will mainly copy
             // technical attributes like timestamp or user information. Semantic
             // attributes should already be equal if we get here.
             //
             target.mergeFrom(source);
-            target.setModified(true);
             objectsWithChildrenToMerge.add(source.getPrimitiveId());
         }