Changeset 2301 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-10-24T07:30:45+02:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3765: Unable to resolve conflict
Improved warning message for conflicting relation versions and added help page

File:

• trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

@@ -55 +55 @@
     public boolean executeCommand() {
         super.executeCommand();
-        conflict.getMy().setOsmId(
-                conflict.getMy().getId(),
-                (int)Math.max(conflict.getMy().getVersion(), conflict.getTheir().getVersion())
-        );
+        if (!conflict.getMy().isNew()) {
+            conflict.getMy().setOsmId(
+                    conflict.getMy().getId(),
+                    (int)Math.max(conflict.getMy().getVersion(), conflict.getTheir().getVersion())
+            );
+        }
         getLayer().getConflicts().remove(conflict);
         rememberConflict(conflict);