Changeset 2753 in josm

Timestamp:

2010-01-07T10:26:02+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #4295: Relations don't update properly

File:

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

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

@@ -321 +321 @@
             objectsWithChildrenToMerge.add(source.getPrimitiveId());
         } else if (! target.isModified() && !source.isModified() && target.getVersion() == source.getVersion()) {
-            // both not modified. Keep mine
-            //
+            // both not modified. Merge nevertheless.
+            // This helps when updating "empty" relations, see #4295
+            target.mergeFrom(source);
+            objectsWithChildrenToMerge.add(source.getPrimitiveId());
         } else if (! target.isModified() && !source.isModified() && target.getVersion() < source.getVersion()) {
             // my not modified but other is newer. clone other onto mine.