Changeset 2624 in josm


Ignore:
Timestamp:
2009-12-13T06:48:07+01:00 (10 years ago)
Author:
mjulius
Message:

fixes #4088,#4155 - when after conflict resolving the primitive has equal semantic attributes as theirs, the primitive will get the same modified flag as theirs.

Location:
trunk/src/org/openstreetmap/josm
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

    r2512 r2624  
    1515
    1616import org.openstreetmap.josm.command.Command;
     17import org.openstreetmap.josm.command.ModifiedConflictResolveCommand;
    1718import org.openstreetmap.josm.command.SequenceCommand;
    1819import org.openstreetmap.josm.command.VersionConflictResolveCommand;
     
    271272            }
    272273            if (isResolvedCompletely()) {
    273                 commands.add(
    274                         new VersionConflictResolveCommand(my, their)
    275                 );
     274                commands.add(new VersionConflictResolveCommand(my, their));
     275                commands.add(new ModifiedConflictResolveCommand(my, their));
    276276            }
    277277        }
Note: See TracChangeset for help on using the changeset viewer.