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

[skyper]

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

[skyper]

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.

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

[skyper]

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

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

[anonymous]

What internal Trac error?

[Upliner]

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

[stoecker]

Trac error fixed.

[Upliner]

patch to fix the problem

[stoecker]

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