Opened 15 years ago
Closed 15 years ago
#3141 closed defect (fixed)
conflict resolution: "apply partial resolution" doesn't work
Reported by: | Apo42 | Owned by: | team |
---|---|---|---|
Priority: | major | Milestone: | |
Component: | Core | Version: | latest |
Keywords: | conflict resolution | Cc: |
Description
when a conflict exists on a way the conflict manager flags also all nodes as conflicts.
to reproduce
load a osm file with older version of way
select ways
File-> update selection
ways are correctly identified with conflicting tags. But all nodes from server have no id in the conflict manager and shouldn't even be listed because there is no action=modify on the nodes. nodes have not been updated between server and Josm.
2nd problem. selecting all nodes and update selection doesn't resolve it either. seems updating nodes does not work but need to test more on this.
3'rd problem
conflict resolution "apply partial resolution" does not work on the same data.
after doing the conflict resolution for the ways the apply partion resolution does nothing. running the conflict resolution dialog again show the same mismatches as before
attaching an osm file with 2 ways and 2 tag changes on them.
using 1876SVN
Attachments (1)
Change History (4)
by , 15 years ago
Attachment: | StatePark9.osm added |
---|
follow-up: 2 comment:1 by , 15 years ago
Summary: | conflict resolution flags false conflicts on nodes → conflict resolution: "apply partial resolution" doesn't work |
---|
The first two issues are fixed in r1881.
comment:2 by , 15 years ago
comment:3 by , 15 years ago
Resolution: | → fixed |
---|---|
Status: | new → closed |
issue 3 fixed in r1904.
It's not possible anymore to apply partial resolutions. You have to resolve a conflict completely, otherwise the apply action won't be enabled anymore.
example with conflicting ways