Changes between Version 2 and Version 3 of DistributingChanges


Ignore:
Timestamp:
02/22/10 18:16:10 (4 years ago)
Author:
johnbywater
Comment:

added consideration of longer text attribute merging

Legend:

Unmodified
Added
Removed
Modified
  • DistributingChanges

    v2 v3  
    4646 - Changeset patch, publication (handle register-get and entity-get, searchable, publish-subscribe) 
    4747 - Changeset patch, retrieval (get and add new changeset patches to local queue entity-get, add to queue) 
    48  - Changeset patch, conflict detection (possibly by asserting either that new values of changed attributes match current values of same attributes in model - so the patch would leave the local model in it's current state, or that old values of changed attributes match current values of same attributes in model?) 
     48 - Changeset patch, conflict detection (possibly by asserting either that new values of changed attributes match current values of same attributes in model - so the patch would leave the local model in it's current state, or that old values of changed attributes match current values of same attributes in model - with refinements for merging diffs to "long text") 
    4949 - Changeset patch, resolution (human response to conflict notification, decide new state, continue the queue) 
    5050 - Changeset patch, application (model merge, record changeset patch has been applied) 
     
    5454 - Model Tag Merge (if there are any editable attributes ) 
    5555 - Model Group Merge (if there are any editable attributes) 
     56 - Model Text Merge (so parts of a longer piece of text can be merged into an otherwise conflicting text attribute) 
    5657 
    5758 - CKAN merge (merge queued changeset patches into the model: FIFO, for each: if changeset patch conflicts, request resolution and stop; otherwise apply changeset patch and continue with next in queue)