Add, Delete or Modify Text

In this section we see how changes to text are resolved. We begiin with some simple examples and then look at how conflicts are handled. Document b (base) is the original, and Document e1 and Document e2 are the edited versions of this. You can see how this works as follows:

• click ORIGINAL EXAMPLE to return to the original values, which are the same in all three documents.
• click ADD TEXT in e2 to add text to Document e2, note it appears in the result.
• click ADD TEXT in e1 to add text to Document e1, note it appears in the result.
• click DELETE TEXT to delete text in Document e2, note that when text is deleted in either document, it is deleted in the result.

Problems occur when there are conflicts, and DeltaXML Sync Concurrent Edit handles these by providing the conflicting information in warning elements. Some of these are shown below:

• click MODIFY AND DELETE CONFLICT to modify the text in e1 but delete it in e2, note that when text is deleted in one document, but is modified in the other, then the deletion overrides but the edited data is provided in a warning.
• click EDIT CONFLICT to edit the text in both e1 and e2 in a different way, note that when text is modified in both e1 and e2, the e2 edit is taken but a warning is provided.
• click ADD WITH CONTENT CONFLICT to add different text in e1 and e2, note that when text is added in both e1 and e2, but with different content, then the content of e2 will be used, with a warning.

Change any elements in Document e1 or Document e2 to see how the concurrent edit result changes.

DeltaXML Input and Output