conflict resolution: "apply partial resolution" doesn't work

[Apo42]

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

[Apo42]

example with conflicting ways

[Gubaer]

The first two issues are fixed in r1881.

[Apo42]

Replying to Gubaer:

The first two issues are fixed in r1881.

Tested and confirmed the fix. issue 3 has low prio now. Nice to have but not required

[Gubaer]

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.