Changeset 2634 in josm for trunk/src/org

Timestamp:

2009-12-14T16:05:18+01:00 (16 years ago)

Author:

mjulius

Message:

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

File:

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

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

@@ -330 +330 @@
         } else if (target.isModified() && ! source.isModified() && target.getVersion() == source.getVersion()) {
             // target is same as source but target is modified
-            // => keep target
+            // => keep target and reset modified flag if target and source are semantically equal
+            if (target.hasEqualSemanticAttributes(source)) {
+                target.setModified(false);
+            }
         } else if (! target.hasEqualSemanticAttributes(source)) {
             // target is modified and is not semantically equal with source. Can't automatically