Opened 10 years ago
Closed 4 months ago
#10297 closed defect (duplicate)
Unnecessary conflict messages
Reported by: | naoliv | Owned by: | team |
---|---|---|---|
Priority: | normal | Milestone: | |
Component: | Core | Version: | tested |
Keywords: | conflict delete server | Cc: | Nakor, liangent, Dakon |
Description
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 http://naoliv.iq.unesp.br/osm/10297.osm.bz2 (16M compressed, 245M uncompressed) and you should get some conflicts with this behavior.
JOSM:
Repository Root: http://josm.openstreetmap.de/svn Build-Date: 2014-07-21 01:35:49 Last Changed Author: Don-vip Revision: 7321 Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b URL: http://josm.openstreetmap.de/svn/trunk 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: [-Djava.net.useSystemProxies=true, -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)
Change History (9)
by , 10 years ago
Attachment: | conflict.png added |
---|
comment:1 by , 10 years ago
comment:2 by , 10 years ago
Long time existing problem, see #6351 and #6595.
Seems to be a regression introduced around four years ago as this comments shows.
comment:3 by , 10 years ago
Keywords: | Nakor liangent added |
---|
comment:4 by , 10 years ago
Cc: | added |
---|---|
Keywords: | conflict delete server added; Nakor liangent removed |
Version: | → tested |
comment:5 by , 9 years ago
Cc: | added |
---|
comment:7 by , 3 years ago
Tried to reproduce with some part of the "monster" but did not get any conflict with both sides deleted.
comment:8 by , 4 months ago
Resolution: | → duplicate |
---|---|
Status: | new → closed |
Ticket #6351 has been marked as a duplicate of this ticket.