JOSM tries to upload a versionless way after it's merged from another layer

[avarab@…]

I did this:

1. Edit Iceland.osm
2. Accidentally deleted a way. But I discovered this after I had done "upload selection" on some other data so my command list was destroyed
3. Download the area in question into a new layer
4. Select the way in question and merge it into Iceland.osm
5. Upload it

Then JOSM proceeded to try to upload the way I had just merged with
the correct ID but no version information:

192.168.002.101.52696-128.040.168.098.00080: PUT /api/0.6/way/23700712 HTTP/1.1
Authorization: OAuth SEEKRT
Content-type: text/xml
User-Agent: JOSM/1.5 (2991 SVN is) Java/1.6.0_16
Host: api.openstreetmap.org
Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2
Connection: keep-alive
Content-Length: 616


192.168.002.101.52696-128.040.168.098.00080: <?xml version='1.0' encoding='UTF-8'?>
<osm version='0.6' generator='JOSM'>
  <way id='23700712' timestamp='2009-03-28T22:28:49Z' uid='25051' user='Bjarki' visible='true' changeset='3883498'>
    <nd ref='34399550' />
    <nd ref='256627025' />
    <nd ref='256627026' />
    <nd ref='256627027' />
    <nd ref='256627028' />
    <nd ref='256627029' />
    <nd ref='256627030' />
    <nd ref='256627031' />
    <nd ref='256627032' />
    <nd ref='639766699' />
    <tag k='ref' v='744' />
    <tag k='highway' v='primary' />
    <tag k='name' v='..ver..rfjallsvegur' />
    <tag k='network' v='S' />
  </way>
</osm>

128.040.168.098.00080-192.168.002.101.52696: HTTP/1.1 400 Bad Request
X-Runtime: 100
Content-Type: text/html; charset=utf-8
Cache-Control: no-cache
Content-Length: 590
Error: Cannot parse valid way from xml string <way id="23700712" timestamp="2009-03-28T22:28:49Z" uid="25051" user="Bjarki" visible="true" changeset="3883498">
Error: <nd ref="34399550"/>
Error: <nd ref="256627025"/>
Error: <nd ref="256627026"/>
Error: <nd ref="256627027"/>
Error: <nd ref="256627028"/>
Error: <nd ref="256627029"/>
Error: <nd ref="256627030"/>
Error: <nd ref="256627031"/>
Error: <nd ref="256627032"/>
Error: <nd ref="639766699"/>
Error: <tag k="ref" v="744"/>
Error: <tag k="highway" v="primary"/>
Error: <tag k="name" v="..ver..rfjallsvegur"/>
Error: <tag k="network" v="S"/>
Error: </way>. Version is required when updating
Date: Mon, 15 Feb 2010 14:56:25 GMT
Server: lighttpd/1.4.22
Cannot parse valid way from xml string <way id="23700712" timestamp="2009-03-28T22:28:49Z" uid="25051" user="Bjarki" visible="true" changeset="3883498">
    <nd ref="34399550"/>
    <nd ref="256627025"/>
    <nd ref="256627026"/>
    <nd ref="256627027"/>
    <nd ref="256627028"/>
    <nd ref="256627029"/>
    <nd ref="256627030"/>
    <nd ref="256627031"/>
    <nd ref="256627032"/>
    <nd ref="639766699"/>
    <tag k="ref" v="744"/>
    <tag k="highway" v="primary"/>
    <tag k="name" v="..ver..rfjallsvegur"
128.040.168.098.00080-192.168.002.101.52696: />
    <tag k="network" v="S"/>
  </way>. Version is required when updating

[mjulius]

(In [3004]) fixes #4533 - JOSM tries to upload a versionless way after it's merged from another layer

save and restore version in OsmPrimitive.saveCommonAttributes() and .load()