Changeset 1692 in josm for trunk/src/org

Timestamp:

2009-06-24T21:03:17+02:00 (15 years ago)

Author:

Gubaer

Message:

 

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MergeVisitor.java (modified) (1 diff)
• gui/conflict/properties/PropertiesMergeModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -246 +246 @@
                     merged.put(other, my);
                 } else if (! my.modified && !other.modified) {
-                    // nothing to merge
+                    // both not modified. Keep mine
                     //
                     merged.put(other,my);
+                } else if (my.modified && ! other.modified && my.version == other.version) {
+                    // my is same as other but mine is modified
+                    // => keep mine
+                    merged.put(other, my);
                 } else if (my.deleted != other.deleted) {
                     // if we get here my is modified. Differences in deleted state

trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java

@@ -337 +337 @@
         if (myCoords != null && theirCoords == null) return true;
         if (myCoords == null && theirCoords == null) return false;
-        return !myCoords.equalsEpsilon(theirCoords);
+        return !myCoords.equals(theirCoords);
     }