Modify

Opened 15 years ago

Closed 15 years ago

#5221 closed defect (fixed)

[PATCH] Conflict manager no longer automatically purges deleted objects

Reported by: NE2 Owned by: team
Priority: major Milestone:
Component: Core Version: latest
Keywords: Cc: AM909, 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 (2)

merger.diff (7.2 KB ) - added by Upliner 15 years ago.
patch for DataSetMerger
osmreader.diff (607 bytes ) - added by Upliner 15 years ago.
patch for OsmReader

Download all attachments as: .zip

Change History (10)

comment:1 by AM909, 15 years ago

Cc: AM909 added
Priority: normalmajor

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.

comment:2 by skyper, 15 years ago

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).

r3377

comment:3 by bastiK, 15 years ago

Cc: Upliner added
Owner: changed from team to Upliner
Version: latest

@Upliner: is this due to your changes?

comment:4 by Upliner, 15 years ago

Status: newassigned

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 by bastiK, 15 years ago

It is there for 3 weeks, so another day does not matter... Most important, it works. ;)

by Upliner, 15 years ago

Attachment: merger.diff added

patch for DataSetMerger

by Upliner, 15 years ago

Attachment: osmreader.diff added

patch for OsmReader

comment:6 by Upliner, 15 years ago

Owner: changed from Upliner to team
Status: assignednew

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.

comment:7 by stoecker, 15 years ago

Summary: Conflict manager no longer automatically purges deleted objects[PATCH] Conflict manager no longer automatically purges deleted objects

comment:8 by stoecker, 15 years ago

Resolution: fixed
Status: newclosed

(In [3423]) fix #5221 - patch by Upliner - errors in conflict manager

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.