[Merkaartor] Conflict management

[Chris Browet]

As some of you have notice, conflict management in Merkaartor is a bit shaky
ATM.

To resume:

- Conflict management is only active for trackpoints (historical, was like
that before I touched any code)
- As of now, a conflict will only arise if you download, modify a point,
redownload and the timestamp from the server is > that the timestamp in
Merkaartor (the timestamp is not modified by your changes), i.e. someone
else modified the point between your 2 downloads

- to resolve a conflict:
  - or you delete the "conflict_" node, meaning you will overwrite the
changes made by the other guy (to avoid, of course)
  - you modify the "conflict_" node, but then you will 2 updates for the
same point (yours + the other guy). The latest modification wins.
  - or you merge the 2 nodes which is obviously the preferred solution.

Someone will have to have a look at conflicts for roads and relations, which
is commented right now, meaning your changes will in any case overwrite what
is on the server.

Regards
- Crhis -
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/merkaartor/attachments/20080717/6bd06b13/attachment.html>