Opened 7 years ago

Last modified 3 months ago

#10297 new defect

Unnecessary conflict messages

Reported by: naoliv Owned by: team
Priority: normal Milestone:
Component: Core Version: tested
Keywords: conflict delete server Cc: Nakor, liangent, Dakon


While validating some data I am seeing some conflicts like this:

If the data is deleted both locally and remotely, what is the logic in having this conflict?
Since it's a delete = delete on both sides, it shouldn't matter a possible different node coordinate (or possible different key/values).

"Update modified" on this monster file (16M compressed, 245M uncompressed) and you should get some conflicts with this behavior.


Repository Root:
Build-Date: 2014-07-21 01:35:49
Last Changed Author: Don-vip
Revision: 7321
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last Changed Date: 2014-07-21 01:51:53 +0200 (Mon, 21 Jul 2014)
Last Changed Rev: 7321

Identification: JOSM/1.5 (7321 en) Linux Debian GNU/Linux testing (jessie)
Memory Usage: 990 MB / 8158 MB (400 MB allocated, but free)
Java version: 1.7.0_60, Oracle Corporation, OpenJDK 64-Bit Server VM
Java package: openjdk-7-jre:amd64-7u60-2.5.0-2
VM arguments: [, -Dawt.useSystemAAFontSettings=on, -Xms1024M, -Xmx8g, -XX:+UseConcMarkSweepGC, -XX:+UseCompressedOops]
Dataset consistency test: No problems found

Plugin: Create_grid_of_ways (30416)
Plugin: OpeningHoursEditor (30519)
Plugin: PicLayer (30436)
Plugin: SimplifyArea (30416)
Plugin: buildings_tools (30485)
Plugin: contourmerge (1010)
Plugin: editgpx (30416)
Plugin: geotools (30416)
Plugin: importvec (30416)
Plugin: jts (30416)
Plugin: log4j (30416)
Plugin: measurement (30416)
Plugin: merge-overlap (30416)
Plugin: opendata (30508)
Plugin: pbf (30495)
Plugin: pdfimport (30416)
Plugin: poly (30495)
Plugin: reverter (30521)
Plugin: scripting (30604)
Plugin: todo (29154)
Plugin: turnrestrictions (30454)
Plugin: undelete (30416)
Plugin: utilsplugin2 (30460)

Attachments (1)

conflict.png (18.7 KB) - added by naoliv 7 years ago.

Download all attachments as: .zip

Change History (7)

Changed 7 years ago by naoliv

Attachment: conflict.png added

comment:1 Changed 7 years ago by skyper

Ticket #6351 has been marked as a duplicate of this ticket.

comment:2 Changed 7 years ago by skyper

Long time existing problem, see #6351 and #6595.

Seems to be a regression introduced around four years ago as this comments shows.

comment:3 Changed 7 years ago by skyper

Keywords: Nakor liangent added

comment:4 Changed 7 years ago by skyper

Cc: Nakor liangent added
Keywords: conflict delete server added; Nakor liangent removed
Version: tested

comment:5 Changed 5 years ago by Dakon

Cc: Dakon added

comment:6 Changed 3 months ago by mdk

Should be fixed with #19783

Modify Ticket

Change Properties
Set your email in Preferences
as new The owner will remain team.
as The resolution will be set.
to The owner will be changed from team to the specified user.
The owner will change to naoliv
as duplicate The resolution will be set to duplicate.The specified ticket will be cross-referenced with this ticket
The owner will be changed from team to anonymous.

Add Comment

E-mail address and name can be saved in the Preferences.

Note: See TracTickets for help on using tickets.