[josm-dev] Conflict resolution doesn't work

2009-05-02 Thread Rolf Bode-Meyer
Is the conflict resolution in JOSM supposed to work? Or may I do something wrong? On updating the data in an edited area I'm told there where conflicts and I get a relation listed in the Conflict panel. On clicking resolve a dialogue pops up but it doesn't show data in either of the three lists.

Re: [josm-dev] Conflict resolution doesn't work

2009-05-02 Thread Karl Guggisberg
there are several problems with conflict detection and conflict resolution in JOSM. Here's a patch for one special case https://josm.openstreetmap.de/ticket/2507 which is yet to be applied to the source tree. If the server version and the client version differ in the value of map feature and and

Re: [josm-dev] Conflict resolution doesn't work

2009-05-02 Thread Frederik Ramm
Hi, Rolf Bode-Meyer wrote: On updating the data in an edited area I'm told there where conflicts and I get a relation listed in the Conflict panel. On clicking resolve a dialogue pops up but it doesn't show data in either of the three lists. Clicking resolve closes the dialogue, the entry in

Re: [josm-dev] Conflict resolution doesn't work

2009-05-02 Thread Karl Guggisberg
Hi, these tickets include descriptions on how to reproduce two conflict resolution bugs. See also attached patches. https://josm.openstreetmap.de/ticket/2510 https://josm.openstreetmap.de/ticket/2507 -- Karl -Ursprüngliche Nachricht- Von: josm-dev-boun...@openstreetmap.org

Re: [josm-dev] Conflict resolution doesn't work

2009-05-02 Thread Frederik Ramm
Hi, Karl Guggisberg wrote: these tickets include descriptions on how to reproduce two conflict resolution bugs. See also attached patches. https://josm.openstreetmap.de/ticket/2510 https://josm.openstreetmap.de/ticket/2507 Both applied! Bye Frederik

Re: [josm-dev] Conflict resolution doesn't work

2009-05-02 Thread Rolf Bode-Meyer
2009/5/2 Frederik Ramm frede...@remote.org: On updating the data in an edited area I'm told there where conflicts and I get a relation listed in the Conflict panel. On clicking resolve a dialogue pops up but it doesn't show data in either of the three lists. Clicking resolve closes the