Changes between Version 2 and Version 3 of DistributingChanges

Timestamp:

02/22/10 18:16:10 (4 years ago)

Author:

johnbywater

Comment:

added consideration of longer text attribute merging

DistributingChanges

@@ -46 +46 @@
  - Changeset patch, publication (handle register-get and entity-get, searchable, publish-subscribe)
  - Changeset patch, retrieval (get and add new changeset patches to local queue entity-get, add to queue)
- - 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?)
+ - 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")
  - Changeset patch, resolution (human response to conflict notification, decide new state, continue the queue)
  - Changeset patch, application (model merge, record changeset patch has been applied)
@@ -54 +54 @@
  - Model Tag Merge (if there are any editable attributes )
  - Model Group Merge (if there are any editable attributes)
+ - Model Text Merge (so parts of a longer piece of text can be merged into an otherwise conflicting text attribute)
 
  - 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)