Modify

Opened 7 years ago

Last modified 6 years ago

#7293 new defect

conflict when replacing a way in an inclomplete loaded relation with a new way

Reported by: mdk Owned by: team
Priority: major Milestone:
Component: Core Version: tested
Keywords: Cc:

Description

I have changed a relation (156332) by adding a landuse=forest and replacing a way. While uploading I got a conflict error. I choose to syncronize only the relation which results in a conflict entry in the conflict view. I select the relation and let me show the history (see attachment).

The last two entries in the version list cause the conflict, but they don't make any sense:
Version 5 is correct (my edit which I upload in changeset 10447743).
But the last entry is Version 4 (again, but not 6). In the list it had the same user and date as the other version 4 entry. But on the right most panel where the details of the last version are shown, there is my e-mail addess as user (instead of my username as in the middle panel) and the dialog is telling me, that the version I'm editing is not equal to the version I've uploaded right now.

  • Why do I have to user name (mdk and kleidt@...)?
  • Why dose JOSM or the server tell me there is a conflict in this relation?

I got these errors from time to time and the only solution is to ignore them and close the changeset (which contains the right data).

By the way, there is an other problem: If I synchronize all in this situation, I got a huge list of conflicts containing only messages which say:

  • My version: Deleted, and some tags, which the object had, before deletion.
  • Version on Server: also Deleted, but the tags are missing (because the DB stores a deleted object without tags)

If both are deleted, it makes no sense show me a conflict :-)

Attachments (2)

conflict.gif (17.7 KB) - added by mdk 7 years ago.
conflict_members.gif (18.3 KB) - added by mdk 7 years ago.
replaced way

Download all attachments as: .zip

Change History (5)

Changed 7 years ago by mdk

Attachment: conflict.gif added

Changed 7 years ago by mdk

Attachment: conflict_members.gif added

replaced way

comment:1 Changed 6 years ago by mdk

Because I get these errors nearly every day (while remapping) I found out more details how to reproduce:

  • load a way which belongs to a relation. The relation is only loaded incomplete.
  • replace this way in the relation at the same position (in the member list of the relation) with a new way (negative id).
  • upload the changeset

Results:

  • I got the message, that a version conflict is on the server with the options "synchronize only this" or "synchronize all changes"
  • I choose to synchronize only the affected relation.
  • The relation is now downloaded compleatly (this time the new way has a new positive ID instead of the negative one)
  • I got a conflict message (see old screenshots) where only the replaced way is marked as a problem (internal negative id from JOSM is not equal to new ID from server)
  • If you look at the version history there is NO newer version on the server, but I get a conflict between my new version and the OLD version on the server.
  • the changeset is accepted by the server
  • the changeset is not closed
  • JOSM still marked the Datalayer as changed (and want to upload it on closing)

At this point you can ignore the problems (or manually close the changeset), because the changeset is compleatly on the server.

But If you try to solve the conflict and upload the data again you will get a lot of new conflicts, because the changes (especially deletes) are all done by an "other" user (your first upload!). Possibly there will be a socond upload of the changes.

Note:
If I change more than one relation this way, I still get only one conflict. And sometimes I get no conflict at all.

comment:2 Changed 6 years ago by mdk

Summary: strange conflict when uploading a changed relationconflict when replacing a way in an inclomplete loaded relation with a new way

comment:3 Changed 6 years ago by mdk

Here is an other way to reproduce:

Instaed of replacing a way, just split it.

Perhaps only adding a new way to an incomplete loaded relation would be enought.

Modify Ticket

Change Properties
Set your email in Preferences
Action
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 mdk
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.