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

Timestamp:

2019-10-08T22:31:06+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18212, see #4088, see #4155 - don't override modified flag of deleted primitives after resolving a conflict

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/conflict/ModifiedConflictResolveCommand.java (modified) (1 diff)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java

@@ -53 +53 @@
     public boolean executeCommand() {
         super.executeCommand();
-        if (!conflict.getMy().isNew() && conflict.getMy().hasEqualSemanticAttributes(conflict.getTheir())) {
+        if (!conflict.getMy().isNew() && !conflict.getMy().isDeleted()
+                && conflict.getMy().hasEqualSemanticAttributes(conflict.getTheir())) {
             conflict.getMy().setModified(conflict.getTheir().isModified());
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -323 +323 @@
     @Override
     public void onConflictsRemoved(ConflictCollection conflicts) {
-        Logging.info("1 conflict has been resolved.");
+        Logging.debug("1 conflict has been resolved.");
         refreshView();
     }