[josm-dev] Conflict resolution doesn't work
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. Clicking resolve closes the dialogue, the entry in the panel is removed but on updating the data or uploading I get the error again. So what is it supposed to do, or is it not finished yet? Rolf ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Conflict resolution doesn't work
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 if the user decides to keep his version conflict resolution doesn't work either. I'm currently working on this one. I also came across the case you're describing here. Sometimes JOSM detects a conflict although the conflict resolution dialog is basically empty. Don't know yet how to reproduce it - do you? Karl -Ursprüngliche Nachricht- Von: josm-dev-boun...@openstreetmap.org [mailto:josm-dev-boun...@openstreetmap.org] Im Auftrag von Rolf Bode-Meyer Gesendet: Samstag, 2. Mai 2009 17:25 An: josm-dev Betreff: [josm-dev] Conflict resolution doesn't work 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. Clicking resolve closes the dialogue, the entry in the panel is removed but on updating the data or uploading I get the error again. So what is it supposed to do, or is it not finished yet? Rolf ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Conflict resolution doesn't work
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 the panel is > removed but on updating the data or uploading I get the error again. I fixed some conflict resolution bugs in version 1561 and tested basic conflict resolution afterwards and found it to work; if you can describe how to reproduce the above problem that would be great. Bye Frederik -- Frederik Ramm ## eMail frede...@remote.org ## N49°00'09" E008°23'33" ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Conflict resolution doesn't work
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 [mailto:josm-dev-boun...@openstreetmap.org] Im Auftrag von Frederik Ramm Gesendet: Samstag, 2. Mai 2009 19:14 An: Rolf Bode-Meyer Cc: josm-dev Betreff: Re: [josm-dev] Conflict resolution doesn't work 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 the panel is > removed but on updating the data or uploading I get the error again. I fixed some conflict resolution bugs in version 1561 and tested basic conflict resolution afterwards and found it to work; if you can describe how to reproduce the above problem that would be great. Bye Frederik -- Frederik Ramm ## eMail frede...@remote.org ## N49°00'09" E008°23'33" ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Conflict resolution doesn't work
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 ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Conflict resolution doesn't work
2009/5/2 Frederik Ramm : >> 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 the panel is >> removed but on updating the data or uploading I get the error again. > > I fixed some conflict resolution bugs in version 1561 and tested basic > conflict resolution afterwards and found it to work; if you can describe how > to reproduce the above problem that would be great. Since version 1567 with Karls fixes didn't change anything for me I opened up ticket 2512 and attached a file to it. As noted there that file is manufactured to give the same error on updating the area (uploading to the server I didn't try to not polute the db in case it goes through nevertheless). Hopefully this helps. Rolf ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
