Opened 8 years ago
Last modified 2 years ago
#8660 reopened defect
False positive conflict detection with reverter plugin
Reported by: | skyper | Owned by: | Upliner |
---|---|---|---|
Priority: | normal | Milestone: | |
Component: | Plugin reverter | Version: | |
Keywords: | conflict node | Cc: |
Description
Thought there was already a ticket about it, but I did not find it.
I get these false positives when reverting but I am not sure if it does happen with other merges,too.
The problem appears with younger nodes than the reverted changeset.
- revert changeset 14914753.
- got 64 conflicts
- look at conflict of node id:980535480
- there is no conflict and you do not have any option to change anything.
The reported conflict is useless.
I am not sure weather these are conflicts and you need some options in the conflict manager or not and the whole conflict should be dropped.
Attachments (3)
Change History (11)
comment:3 Changed 8 years ago by
Component: | Core → Plugin reverter |
---|---|
Owner: | changed from team to Upliner |
comment:5 Changed 8 years ago by
Resolution: | fixed |
---|---|
Status: | closed → reopened |
Looks like it is not yet fully fixed as I found several useless conflicts while reverting changeset 15875597.
comment:6 Changed 8 years ago by
Summary: | False positive conflict detection with nodes (reverter) → False positive conflict detection with reverter plugin |
---|
(with ways, I think I have fixed the problem only for nodes in fact)
Changed 2 years ago by
Attachment: | test.osm.bz2 added |
---|
comment:7 Changed 2 years ago by
I can still reproduce useless conflicts when loading the attached file and reverting 15875597 with current binaries,
e.g. way 75022047 is not modified but I see a conflict. I'll have a closer look again.
Changed 2 years ago by
Attachment: | conflict.PNG added |
---|
comment:8 Changed 2 years ago by
I fear I don't fully understand the concept of the conflicts produced by reverter.
Example:
I download a small area around node 5145791503 which - as of now - has a history of 3 versions. The data
also contains the way 529734514.
Let's assume I like the version 1 better, so I revert the cs 52802997 which changed it to v2.
I revert with "revert selection only" and I get a conflict (unexpected).
The code in the plugin detects a conflict because it compares v2 with the version in my data (v3)
and finds that the coordinates are different. This is the reason that the conflict that is created.
The conflict displayed in the dialog also claims that version 3 of the node is not member of way 529734514,
which is simply wrong as the node is still a member of the way (on the server and also in my data).
Am I right that my revert should not produce a conflict?
Changed 2 years ago by
Attachment: | 8660.patch added |
---|
Please review: This patch suppresses useless conflicts which are typical when you revert a changeset that was already reverted by a more recent cs
It also produces an exception if we click on the left button of the tags tab: