Modify ↓
Opened 16 years ago
Closed 16 years ago
#2510 closed enhancement (fixed)
[Patch] ConflictItem - Refactoring
| Reported by: | Gubaer | Owned by: | Gubaer |
|---|---|---|---|
| Priority: | minor | Milestone: | |
| Component: | Core | Version: | latest |
| Keywords: | conflict resolution merge | Cc: | Gubaer |
Description (last modified by )
| 1 | JOSM 1 | Server | JOSM 2 |
| 2 | Create amenity=biergarten testkey=value1 and upload | amenity=biergarten testkey=value1 id=1 version=1 | |
| 3 | amenity=biergarten testkey=value1 id=1 version=1 | Downlad amenity=biergarten testkey=value1 id=1 version=1 | |
| 4 | Update amenity=biergarten testkey=value2 id=1 version=1 and upload | amenity=biergarten testkey=value2 id=1 version=2 | |
| 5 | amenity=biergarten testkey=value2 version=2 | Update amenity=biergarten testkey=value3 version=1 | |
| 6 | amenity=biergarten testkey=value2 version=2 | Download and merge results in a conflict as expected | |
| 7 | Resolve conflict and decide to keep my value, i.e. testkey=value3 | ||
| 8 | Upload results in 409 conflict. Local version is still version 1 | ||
The problem is in step 7. If the user decides to keep his value the local version is not updated to the higher version from the server.
See patch for a fix.
Attachments (2)
Change History (8)
by , 16 years ago
| Attachment: | property-conflict.patch added |
|---|
comment:1 by , 16 years ago
| Cc: | added |
|---|
follow-up: 3 comment:2 by , 16 years ago
| Resolution: | → fixed |
|---|---|
| Status: | new → closed |
comment:3 by , 16 years ago
| Priority: | major → minor |
|---|---|
| Resolution: | fixed |
| Status: | closed → reopened |
| Summary: | [Patch] Bug when keeping local (my) value in property conflict resolution → [Patch] ConflictItem - Refactoring |
| Type: | defect → enhancement |
by , 16 years ago
| Attachment: | conflict-resolution.patch added |
|---|
comment:4 by , 16 years ago
| Description: | modified (diff) |
|---|
Actually I do not know what to do with this ticket? Does this still apply? Karl, can you take care of it yourself?
comment:5 by , 16 years ago
| Owner: | changed from to |
|---|---|
| Status: | reopened → new |
This reminds me that the new extended conflict resolution dialog does net yet resolve conflicts due to different positions or different deleted states!
I'll take care of it.
comment:6 by , 16 years ago
| Resolution: | → fixed |
|---|---|
| Status: | new → closed |
r1654 includes merge support for coordinate conflicts and conflicts in deleted state, too.
This ticket is outdatet and the the patch attachment:conflict-resolution.patch is not needed anymore.
=> Closing
Note:
See TracTickets
for help on using tickets.
Applied in r1567. I have also made the same change for the DeleteConflict and PositionConflict classes. We should perhaps investigate moving that functionality up in the class hierarchy?