Changeset 15444 in josm


Ignore:
Timestamp:
2019-10-08T22:31:06+02:00 (2 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java

    r12726 r15444  
    5353    public boolean executeCommand() {
    5454        super.executeCommand();
    55         if (!conflict.getMy().isNew() && conflict.getMy().hasEqualSemanticAttributes(conflict.getTheir())) {
     55        if (!conflict.getMy().isNew() && !conflict.getMy().isDeleted()
     56                && conflict.getMy().hasEqualSemanticAttributes(conflict.getTheir())) {
    5657            conflict.getMy().setModified(conflict.getTheir().isModified());
    5758        }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r14153 r15444  
    323323    @Override
    324324    public void onConflictsRemoved(ConflictCollection conflicts) {
    325         Logging.info("1 conflict has been resolved.");
     325        Logging.debug("1 conflict has been resolved.");
    326326        refreshView();
    327327    }
Note: See TracChangeset for help on using the changeset viewer.