Changeset 1692 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

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

Author:

Gubaer

Message:

 

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.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