Modify ↓

Opened 4 years ago

Closed 4 years ago

#2507 closed defect (fixed)

[Patch] Bug when merging two semantically equal version of a primitive

Reported by: Gubaer Owned by: team
Priority: major Component: Core
Version: latest Keywords:
Cc: karl.guggisberg@…

Description

1JOSM 1 Server JOSM 2
2Create
amenity=biergarten
testkey=value1
and upload		amenity=biergarten
testkey=value1
id=1
version=1
3amenity=biergarten
testkey=value1

id=1
version=1		Downlad
amenity=biergarten
testkey=value1
id=1
version=1
4Update
amenity=biergarten
testkey=value2
id=1
version=1
and upload		amenity=biergarten
testkey=value2
id=1
version=2
5amenity=biergarten
testkey=value2
version=2		Update
amenity=biergarten
testkey=value2
version=1
6amenity=biergarten
testkey=value2
version=2		Download and merge results in
amenity=biergarten
testkey=value2
version=1
7amenity=biergarten
testkey=value2
version=2		Update amenity=biergarten
testkey=value3
version=1
8amenity=biergarten
testkey=value2
version=2		Upload results in a Conflict

The problem is in step 6. The version on the server and on the client are sematically equal (same keys, same values, same id). JOSM_2 should therefore merge the higher version into the target node. Otherwise any subsequente uploads from JOSM_2 result in a conflict.

Attachments (1)

conflict-resolution.patch​ (2.4 KB) - added by Gubaer 4 years ago.
patch

Download all attachments as: .zip

Change History (3)

Changed 4 years ago by Gubaer

patch

comment:1 Changed 4 years ago by Gubaer

  • Cc karl.guggisberg@… added

comment:2 Changed 4 years ago by framm

  • Resolution set to fixed
  • Status changed from new to closed

applied in r1567.

Add Comment

Modify Ticket

Change Properties
<Author field>
Action
as closed .
as The resolution will be set. Next status will be 'closed'.
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

Attachments ↑ Description ↑
 
Note: See TracTickets for help on using tickets.