- Timestamp:
- 2010-01-07T10:26:02+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r2634 r2753 321 321 objectsWithChildrenToMerge.add(source.getPrimitiveId()); 322 322 } else if (! target.isModified() && !source.isModified() && target.getVersion() == source.getVersion()) { 323 // both not modified. Keep mine 324 // 323 // both not modified. Merge nevertheless. 324 // This helps when updating "empty" relations, see #4295 325 target.mergeFrom(source); 326 objectsWithChildrenToMerge.add(source.getPrimitiveId()); 325 327 } else if (! target.isModified() && !source.isModified() && target.getVersion() < source.getVersion()) { 326 328 // my not modified but other is newer. clone other onto mine.
Note:
See TracChangeset
for help on using the changeset viewer.