Ticket #5221 (closed defect: fixed)
[PATCH] Conflict manager no longer automatically purges deleted objects
| Reported by: | NE2 | Owned by: | team |
|---|---|---|---|
| Priority: | major | Component: | Core |
| Version: | latest | Keywords: | |
| Cc: | alan.mintz@…, upliner@… |
Description
I think this was just introduced in the last version. When you delete an object from outside JOSM and then update it in JOSM, it used to automatically purge it. Now you have to go through the conflict manager to do this, separately for each node of a long way.
Attachments
-
merger.diff
(7.2 KB) -
added by Upliner 19 months ago.
- patch for DataSetMerger
-
osmreader.diff
(607 bytes) -
added by Upliner 19 months ago.
- patch for OsmReader
Change History
comment:1 Changed 19 months ago by Am909
- Cc alan.mintz@… added
- Priority changed from normal to major
comment:2 Changed 19 months ago by skyper
Same with deleted Objects in JOSM after Update. JOSM shows conflicts because of differences in Tags (my = all last tags | server = no tags at all).
comment:3 Changed 19 months ago by bastiK
- Cc upliner@… added
- Owner changed from team to Upliner
- Version set to latest
@Upliner: is this due to your changes?
comment:4 Changed 19 months ago by Upliner
- Status changed from new to assigned
Yes, it's my fault.
I've pushed preliminary solution to the GitHub, but even haven't tested it: http://github.com/Upliner/josm/commit/3a4888efa9c8fd089df335ac84f9102645882f86
comment:5 Changed 19 months ago by bastiK
It is there for 3 weeks, so another day does not matter... Most important, it works. ;)
comment:6 Changed 19 months ago by Upliner
- Owner changed from Upliner to team
- Status changed from assigned to new
I suppose that the new solution is quite stable now. At the same time I want to fix another my oversight in the OsmReader: don't mark objects with attributes 'visible="false" action="delete"' as modified.
If true, I would think this is at least "major", since it can leave you in a spot where you have an edit session where you've done a lot of work and your only choices are to either spend a bunch of time resolving the conflicts one by one, or abandon your edits and do them again after re-downloading a fresh set of data.