Changeset 3965 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
- Timestamp:
- 2011-03-09T00:03:07+01:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r3719 r3965 309 309 // take. We take target. 310 310 // 311 } else if (target.isVisible() != source.isVisible() && target.getVersion() == source.getVersion()) 312 // Same version, but different "visible" attribute. It indicates a serious problem in datasets. 311 } else if (!target.isModified() && !source.isModified() && target.isVisible() != source.isVisible() && target.getVersion() == source.getVersion()) 312 // Same version, but different "visible" attribute and neither of them are modified. 313 // It indicates a serious problem in datasets. 313 314 // For example, datasets can be fetched from different OSM servers or badly hand-modified. 314 315 // We shouldn't merge that datasets.
Note:
See TracChangeset
for help on using the changeset viewer.