[josm-dev] josm 2180 seems to invent conflicts and then fail to properly resolve them?

[ael]

Maybe this should be on the newbies list, but still.

Using josm latest, 2180, earlier this evening, it started reporting 
conflicts which I am fairly certain were spurious.

I was uploading frequently in small changes partly because josm runs so 
slowly, and partly because I have had a few crashes with recent 
versions. I didn't want to spend hours on an edit only to have to do it 
again :-) In the event that's exactly what happened...

OK. Now I haven't encountered conflicts before, and maybe I 
misunderstand something. But I opened the conflicts window, selected the 
problem, and used the resolve option. That seemed to fix the problem, 
but when I then tried to upload the changes, it didn't complete, but 
instead reported an error.

I haven't (yet) opened a ticket on this because I don't think that I 
understand what is happening well enough to provide much useful information.

However, I find it hard to believe that I am the only one experiencing 
these problems (or perhaps I am misusing the multiple changesets 
somehow), so I thought that I should ask here first.

I do have a little of the output from part of a failing session:

--------------------------------------------------------------
$ Revision: Path: trunk
URL: http://josm.openstreetmap.de/svn/trunk
Repository Root: http://josm.openstreetmap.de/svn
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Revision: 2180
Node Kind: directory
Last Changed Author: stoecker
Last Changed Rev: 2180
Last Changed Date: 2009-09-21 13:11:21 +0200 (Mon, 21 Sep 2009)


loading AgPifoJ
loading DirectUpload
loading editgpx
loading measurement
loading validator
opening fc for extension null
Open file: /home/someone/mapping/22-9-2009/220909.gpx (1102912 bytes)
GET http://www.openstreetmap.org/api/capabilities... OK
Communications with http://www.openstreetmap.org/api established using 
protocol version 0.6

GET 
http://www.openstreetmap.org/api/0.6/map?bbox=-1.544492718163326,51.81650224203192,-1.5003183705164196,51.8588818258819
returning array list with size: 733
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=0
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=1
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=2
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=3
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=4
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=5
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=6
GET 
http://www.openstreetmap.org/api/0.6/trackpoints?bbox=-1.5444954471170094,51.81150545766499,-1.5020482225854301,51.852228089849945&page=7
returning array list with size: 733
returning array list with size: 733
PUT http://www.openstreetmap.org/api/0.6/changeset/create... OK
POST http://www.openstreetmap.org/api/0.6/changeset/2572692/upload... OK
PUT http://www.openstreetmap.org/api/0.6/changeset/2572692/close... OK
returning array list with size: 738
returning array list with size: 738
returning array list with size: 740
returning array list with size: 740
PUT http://www.openstreetmap.org/api/0.6/changeset/create... OK
POST http://www.openstreetmap.org/api/0.6/changeset/2572860/upload... Gone
Error header: The node with the id 36480515 has already been deleted <==
PUT http://www.openstreetmap.org/api/0.6/changeset/2572860/close... OK
GET http://www.openstreetmap.org/api/0.6/nodes?nodes=36480515
returning array list with size: 1
returning array list with size: 1
  ...

-------------------------------------------------------------------------------------

After 3 or 4 attempts to use josm-latest, I gave up and used josm-tested 
{I think the measurement plugin might be broken there: fixed later}. No 
problems with that version, so it looks like 2180 is broken somehow.

I will await advice about whether to submit a ticket.

ael