Conflict not resolvable if node is deleted on the server

[Gubaer]

Upload of a changset with a node which has been deleted on the server will result in a 409 conflict (as expected).

It isn't possible to resolve this conflict in JOSM. Neither "Download from OSM" nor "Update data" includes the deleted node. Thus, JOSM doesn't detect a conflict which could be resolved (automaticall or manually).

Here's how to reproduce:

• start two JOSM instances JOSM 1 and JOSM 2
• use ​http://dev06.api.openstreetmap.org/api as server URL (Configurations -> Connection settings)
• use a small, empty area

1	JOSM 1	Server	JOSM 2
2	Create a node with amenity=biergarten testkey=value1 and upload	amenity=biergarten testkey=value1 id=1 version=1
3	amenity=biergarten testkey=value1 id=1 version=1		Downlad amenity=biergarten testkey=value1 id=1 version=1
4	Delete amenity=biergarten testkey=value2 id=1 version=1 and upload	amenity=biergarten testkey=value2 id=1 version=2 visible=false
5	amenity=biergarten testkey=value2 version=2 visible=false		Update amenity=biergarten testkey=value2 version=1 and upload -> results in conflict as expected
6	amenity=biergarten testkey=value2 version=2 visible=false		Download is empty, because the node has been deleted -> conflict is not resolved. File->"Update data" doesn't help either

[framm]

Am I misunderstanding something or is this the same issue (that would be solved by the same procedure) as outlined in #2529?

Please reserve the priority "critical" for bugs that make JOSM unusable for a large portion of users. A bug that is only triggered in the rare case where two people delete the same node at the same time *is* a bug but it is hardly critical!

[anonymous]

Replying to framm:

Am I misunderstanding something or is this the same issue (that would be solved by the same procedure) as outlined in #2529?

There is a subtle difference.

#2529 describes a changeset which deletes a node which is already deleted. The server responds with a 410 Gone and an error body which includes the id of the respective node. JOSM could make use of this information. It could infom the user that a 410 Gone was detected. Then it could delete the node locally and resubmit the changeset. This would be a possible resolution strategy.

This ticket describes another conflict in a changeset, which updates a node which is already deleted. The server replies with a 409 Conflict and an error body which include the id of the respective node. JOSM could get the individual node from the server and compare it with the local node. If it was deleted on the server it could ask the user whether he want's to keep it's local copy or not. If the user selects "don't keep", then JOSM can remove the node from the local data set. If the user selects "keep it", JOSM has to create a clone of the node and delete the original node (it is probably not possible to "undelete" an already deleted node on the server).

Please reserve the priority "critical" for bugs that make JOSM unusable for a large portion of users. A bug that is only triggered in the rare case where two people delete the same node at the same time *is* a bug but it is hardly critical!

Agree

[stoecker]

Closed as duplicate of #2609.