Modify

Opened 11 years ago

Closed 11 years ago

#4675 closed defect (fixed)

[PATCH] conflict solution: deleting node and undo, does not render way right.

Reported by: skyper Owned by: team
Priority: critical Milestone:
Component: Core Version: latest
Keywords: conflict undo delete node Cc:

Description

HI

Thanks for your work. We are getting there !!!

I have a conflict on node, It is "not on server".
This node is member of a way.
If I solve the conflict by deleting the node on my data and afterwards choose undo. The node reappears as "lonely" node instead of member of the way.
I do not know if this is just a render issue or if it is a data issue.

r3057-r3081, openjdk and sun

Attachments (1)

undoconflict.diff (3.3 KB) - added by Upliner 11 years ago.
patch to fix the problem

Download all attachments as: .zip

Change History (11)

comment:1 Changed 11 years ago by skyper

Priority: criticalblocker

I came across this bug again, and this time it led to inconsistant data.

Accidently, I deleted a node which belong to another way with only to nodes. The way was not deleted and validator reported it as a way with only one node. There was no way of retrieving this way and trying to connect a new way to it led to an exception.

comment:2 in reply to:  1 Changed 11 years ago by skyper

Replying to skyper:

I came across this bug again, and this time it led to inconsistant data.

Sorry:

Accidently, I deleted a node which belonged to another way with only to two nodes. The way was not deleted and validator reported it as a way with only one node. There was no way of retrieving this way and trying to connect a new way to it led to an exception.

comment:3 Changed 11 years ago by stoecker

Priority: blockernormal

comment:4 Changed 11 years ago by skyper

Priority: normalcritical

Any chance to fix it ?
It is deleting data and no possibility to undo.

comment:5 Changed 11 years ago by Upliner

I've made the patch to fix this issue: http://gist.github.com/441223 (I've tried to attach it here, but encoutered internal Trac error, see here: http://gist.github.com/441239).

In future I want to change the conflict system and fully get rid of PurgePrimitivesCommand and UndeletePrimitivesCommand.

comment:6 Changed 11 years ago by Upliner

Summary: conflict solution: deleting node and undo, does not render way right.[PATCH] conflict solution: deleting node and undo, does not render way right.

comment:7 Changed 11 years ago by anonymous

What internal Trac error?

comment:8 Changed 11 years ago by Upliner

Error is:
"UnboundLocalError: local variable 'content' referenced before assignment"
I'd put error details in the gist.

comment:9 Changed 11 years ago by stoecker

Trac error fixed.

Changed 11 years ago by Upliner

Attachment: undoconflict.diff added

patch to fix the problem

comment:10 Changed 11 years ago by stoecker

Resolution: fixed
Status: newclosed

(In [3335]) #close #4675 - patch by Upliner - error in conflict/undo handling

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.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.