Changeset 1701 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-06-27T02:14:00+02:00 (15 years ago)

Author:

Gubaer

Message:

updated merge logic and unit tests for MergeVisitor

File:

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

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

@@ -110 +110 @@
                 }
                 if (my.hasEqualSemanticAttributes(other)) {
-                    // copy the technical attributes from their
-                    // version
-                    if (other.deleted) {
-                        myDataSet.unlinkReferencesToPrimitive(my);
-                        my.delete(true);
+                    if (my.deleted != other.deleted) {
+                        // differences in deleted state have to be merged manually
+                        //
+                        conflicts.put(my, other);
+                    } else {
+                        // copy the technical attributes from other
+                        // version
+                        my.visible = other.visible;
+                        my.user = other.user;
+                        my.setTimestamp(other.getTimestamp());
+                        my.modified = other.modified;
+                        merged.put(other, my);
                     }
-                    my.visible = other.visible;
-                    my.user = other.user;
-                    my.setTimestamp(other.getTimestamp());
-                    my.modified = other.modified;
-                    merged.put(other, my);
                     return;
                 }