Ticket #8660: 8660.patch

src/reverter/ChangesetReverter.java

@@ -12 +12 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
+import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
@@ -345 +347 @@
         DataSetCommandMerger merger = new DataSetCommandMerger(nds, ds);
         cmds.addAll(merger.getCommandList());
 
+        // Create a set of objects that will be modified by the merge commands
+        Set<OsmPrimitive> modified = new HashSet<>();
+        for (Command cmd : cmds) {
+                if (cmd instanceof ChangeCommand) {
+                        modified.add(((ChangeCommand) cmd).getOsmPrimitive());
+                }
+        }
+
         //////////////////////////////////////////////////////////////////////////
         // Create a set of objects to be deleted
 
@@ -386 +396 @@
                     /* Don't create conflict if changeset object and dataset object
                      * has same semantic attributes (but different versions) */
                     !hasEqualSemanticAttributes(dp, hp)
+                    // Don't create conflict for object which is not changed or deleted
+                    && (modified.contains(dp) || toDelete.contains(dp))
                     /* Don't create conflict if the object has to be deleted but has already been deleted */
                     && !(toDelete.contains(dp) && dp.isDeleted())) {
-                cmds.add(new ConflictAddCommand(layer.data, createConflict(dp,
-                        entry.getModificationType() == ChangesetModificationType.CREATED)));
-                conflicted.add(dp);
+                cmds.add(new ConflictAddCommand(layer.data,
+                                createConflict(dp, entry.getModificationType() == ChangesetModificationType.CREATED)));
+                conflicted.add(dp);
             }
         }