Opened 15 years ago

Last modified 5 years ago

#5619 new defect

"update data" does not find conflicts — at Version 6

Reported by: skyper Owned by: team
Priority: normal Milestone:
Component: Core Version:
Keywords: update conflict Cc:

Description (last modified by skyper)

I canceled an upload. (It was near the end as later all changes where uploaded already).

There existed only on data layer and validator at that moment.
I updated data and no conflict was reported.
I added one more node and tried to upload but then I got several conflicts, all because of duplicated ways/nodes and their relations.
I ended up with just my singled node left to upload after resolving all errors and conflicts.

All these conflicts should have been reported by "update data"
(By the way, conflicts which are already solved are still shown)

r3652

Change History (6)

comment:1 by stoecker, 14 years ago

The problem is very likely that JOSM silently removes the "created_by". This results in conflicts on data update.

in reply to:  1 comment:2 by skyper, 14 years ago

Replying to stoecker:

The problem is very likely that JOSM silently removes the "created_by". This results in conflicts on data update.

All the duplicates were my own new adds, which had been uploaded but I canceled during the server response. There should be no conflict of created_by because all data involed had been created by me using JOSM.

The problem was that JOSM did fail on the update right after a canceled upload. Sadly I do not have any data-file anymore. Try to keep them the next time.

Wonder how you can reach that state again (cancel upload during server responce for completion).

comment:3 by skyper, 12 years ago

Description: modified (diff)

One problem could be that nodes outside download area are not checked. See #6128.

comment:4 by skyper, 10 years ago

Had this problem once more:

  1. edit for some time that other user is changing same object -> conflict
  2. solve conflict
  3. download the conflicting objects into new layer
  4. merge layers
  5. upload

upload stops asking to synchronize. Choosing all data does not work. Had to start upload three times to get all conflicting ways and their child nodes to sync. After that I hit #11010.

comment:5 by skyper, 9 years ago

Keywords: update conflict added

comment:6 by skyper, 5 years ago

Description: modified (diff)
Note: See TracTickets for help on using tickets.