Modify

Opened 15 years ago

Closed 15 years ago

#5004 closed defect (fixed)

reverter plugin: unnecessary conflicts after undeleting (along with other conflicts)

Reported by: bastiK Owned by: Upliner
Priority: minor Milestone:
Component: Plugin reverter Version: latest
Keywords: Cc:

Description

Have a change set 1 that deletes some objects and modifies others.

Have a change set 2 that puts some modification on top.

Revert change set 1 and try to upload. Result:

  • First it shows a message that the server has a higher version than yours. (That's ok so far.)
  • JOSM offers to synchronize the entire data set -> OK
  • JOSM does not find the undeleted objects in the downloaded data set ("might be deleted") and suggests to check on server -> OK
  • -> On top of the normal conflicts it creates a conflict for each undeleted object.
  • desired behaviour: Do not create these conflicts because it is clear that the change of the 'visible' attribute is on purpose and need not be resolved.

Btw., thanks for writing the plugin!

Attachments (0)

Change History (2)

comment:1 by stoecker, 15 years ago

Component: PluginPlugin reverter
Keywords: plugin reverter removed

comment:2 by Upliner, 15 years ago

Resolution: fixed
Status: newclosed

new version doesn't create any conflicts for clean undeletetion

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Upliner.
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.