[josm-dev] Already deleted nodes one at a time

[Shaun McDonald]

On 11 Aug 2009, at 22:32, Dirk Stöcker wrote:

> On Tue, 11 Aug 2009, Karl Guggisberg wrote:
>
>>> Yes, it may be a bit more complicated with deleted nodes. Search for
>> "modified" (or search for "deleted") in search
>>> dialog will show all modified nodes. The update these nodes with the
>> update selected.
>>
>> Hmm, this shouldn't be necessary. UpdateDataAction compares with
>> data.getCompletePrimitiveIds() which includes modified
>> and deleted ids (and removes then the ID 0 for new primitives).
>>
>> Anything special with the dataset we discuss here?
>
> When we are on topic and Trac is offline:
>
> There are some cases where conflicts should be resolved automatically:
> - server has deleted element and local element is deleted also -->  
> delete
> - server has deleted element and local element is unmodified -->  
> delete
>

+1
This will resolve the annoyances that I've had most of the time with  
conflicts.

Shaun