Modify ↓
Opened 4 years ago
Closed 4 years ago
#2510 closed enhancement (fixed)
[Patch] ConflictItem - Refactoring
| Reported by: | Gubaer | Owned by: | Gubaer |
|---|---|---|---|
| Priority: | minor | Component: | Core |
| Version: | latest | Keywords: | conflict resolution merge |
| Cc: | karl.guggisberg@… |
Description (last modified by stoecker)
| 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)
Changed 4 years ago by Gubaer
comment:1 Changed 4 years ago by Gubaer
- Cc karl.guggisberg@… added
comment:2 follow-up: ↓ 3 Changed 4 years ago by anonymous
- Resolution set to fixed
- Status changed from new to closed
comment:3 in reply to: ↑ 2 Changed 4 years ago by Gubaer
- Priority changed from major to minor
- Resolution fixed deleted
- Status changed from closed to reopened
- Summary changed from [Patch] Bug when keeping local (my) value in property conflict resolution to [Patch] ConflictItem - Refactoring
- Type changed from defect to enhancement
Changed 4 years ago by Gubaer
comment:4 Changed 4 years ago by stoecker
- 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 Changed 4 years ago by Gubaer
- Owner changed from team to Gubaer
- Status changed from reopened to 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 Changed 4 years ago by Gubaer
- Resolution set to fixed
- Status changed from new to 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?