Multi-master text synchronization using deltas

• US 10,216,755 B2
• Filed: 12/21/2012
• Issued: 02/26/2019
• Est. Priority Date: 02/24/2010
• Status: Active Grant

• Current Assignee: Microsoft Technology Licensing LLC (Microsoft Corporation)
• Original Assignee: Microsoft Technology Licensing LLC (Microsoft Corporation)
• Inventors: Kasetty, Shruti, Elson, Anil Abraham
• Primary Examiner(s): Blair, Douglas B
• Application Number:
  US13/724,844
• Publication Number:
  US 20130117220A1
• Time in Patent Office: 2,258 Days
• Field of Search: 709205
• CPC Class Codes: G06F 16/1767 Concurrency control, e.g. optimistic or pessimistic approaches
• CPC Class Codes: G06F 40/194 Calculation of difference between files
• CPC Class Codes: G06F 40/197 Version control for software G06F8/71
• CPC Class Codes: G06Q 10/101 Collaborative creation, e.g. joint development of products or services

Abstract

A server enforces a policy for selecting what received change to process. The non-selected changes are not processed by the server. Instead, after the selected change is processed and is incorporated into the current version of the text, the server sends an update to each of the clients indicating the change made to the current version of text. A client performs a conflict resolution procedure when its change was not processed by the server. The conflict resolution procedure detects the differences between the updated text version and its text change that was not accepted by the server and uses the differences to deduce the intent of the user and come up with a merged version of the text which preserves the intent and avoids data loss. The updated version is then sent back to the server to update the current version of the text.

Claims

1. A computer-implemented method for resolving conflicts to co-edited text, comprising:

receiving, at a server that is hosting a master version of the co-edited text, difference notifications from clients that are hosting client versions of the co-edited text, wherein each difference notification of the difference notifications indicates a difference in the co-edited text between a given client version of the co-edited text and the master version of the co-edited text as determined by a given client;

in response to receiving the difference notifications, selecting, at the server, a policy to determine a sole difference notification of the difference notifications to select to process;

selecting, at the server, the sole difference notification of the difference notifications received from the clients to process based on the selected policy;

updating, at the server, the master version of the co-edited text with the selected difference notification to provide an updated master version of the co-edited text reflecting the sole difference notification;

sending an update notification to the clients reflecting the selected difference notification;

receiving, at the server from a conflicted client of the clients, an updated difference notification, wherein the conflicted client transmitted an unselected difference notification to update the master version of the co-edited text that was not selected by the server for provision in the updated master version of the co-edited text, and wherein the updated difference notification reflects a conflict resolution process executed by the conflicted client to reconcile the unselected difference notification and the selected difference notification in a client version of the co-edited text hosted by the conflicted client; and

updating, at the server, the updated master version of the co-edited text to reflect the updated difference notification to provide a reconciled master version of the co-edited text.

2. The method of claim 1, wherein the policy is a first person wins policy that selects a first difference notification received at the server.

3. The method of claim 1, wherein the server selects the sole difference notification and ignores any other difference notifications.

4. The method of claim 1, wherein the updated notification sent to the clients comprises deltas to the master version of the co-edited text.

5. The method of claim 1, wherein the conflict resolution process performed by each client is based on the given client version of the co-edited text hosted by the given client and the update notification.

6. The method of claim 1, wherein the conflict resolution process indicates text merges performed by the conflicted client of the non-selected difference notification with the update to the updated master version of the co-edited text.

7. The method of claim 1, wherein the conflict resolution procedure is performed by the conflicted client in response to a determination by the conflicted client that the conflicted client transmitted a non-selected text change to the server.

8. A system for resolving conflicts to co-edited text, comprising:

a processor and a computer-readable storage medium;

an operating environment stored on the computer-readable storage medium and executing on the processor, which causes the system to;

receive, at a server that is hosting a master version of the co-edited text, difference notifications from clients hosting client version of the co-edited text, wherein each difference notification of the difference notification indicates a difference in the co-edited text between a given client version of the co-edited text and the master version of the co-edited text as determined by a given client that is hosting the given client version of the co-edited text;

in response to receiving the difference notifications, select, at the server, a sole difference notification of the difference notifications received by the server to process, wherein the sole difference notification was received from a particular client of the clients that is hosting a particular client version of the co-edited text;

update, at the server, the master version of the co-edited text with the selected sole difference notification to provide an updated master version of the co-edited text that reflects a text change made to the particular client version of the co-edited text made by the particular client;

send an update notification to the clients reflecting the text change;

receive, at the server from a conflicted client of the clients, an updated difference notification, wherein the conflicted client made an unselected difference notification to update the master version of the co-edited text that was not selected by the server for provision in the updated master version of the co-edited text, and wherein the updated difference notification reflects a conflict resolution process executed by the conflicted client to reconcile the unselected difference notification and the selected difference notification in a client version of the co-edited text hosted by the conflicted client; and

update, at the server, the updated master version of the co-edited text to reflect the updated difference notification to provide a reconciled master version of the co-edited text.

9. The system of claim 8, wherein the server uses a first person wins policy to select the sole difference notification from among the difference notifications received from the clients.

10. The system of claim 8, wherein the server selects the sole difference notification and ignores any other difference notifications received before the update notification is sent.

11. The system of claim 8, wherein the updated notification sent to the clients comprises deltas to the master version of the co-edited text.

12. The system of claim 8, wherein a conflict resolution procedure is performed by each client of the clients is unique to the given client version of the co-edited text hosted by the given client and the updated notification.

13. The system of claim 8, wherein the conflict resolution process indicates text merges performed by the conflicted client of the non-selected difference notification with the update to the updated master version of the co-edited text.

14. The system of claim 8, wherein the updated notification indicates to the particular client that the particular client does not need to perform the conflict resolution process.

15. A method for resolving conflicts to co-edited text, comprising:

hosting, at a server, a master version of the co-edited text;

distributing, from the server to a first client, a first client version of the co-edited text based on the master version;

distributing, from the server to a second client, a second client version of the co-edited text based on the master version;

receiving, at the server from the first client, a first difference notification indicating changes made to the co-edited text by the first client in the first client version;

receiving, at the server from the second client, a second difference notification indicating changes made to the co-edited text by the second client in the second client version;

in response to receiving at least one of the first difference notification and the second difference notification, selecting a policy to determine which of the first difference notification and the second difference to select;

based on the selected policy, selecting, at the server, the first difference notification;

in response to selecting the first difference notification, discarding, at the server, the second difference notification;

updating, at the server, the master version with the first difference notification to produce a first updated master version of the co-edited text;

sending, from the server to the first client and the second client, a first update notification reflecting the first difference notification;

in response to sending the first update notification to the second client, receiving, at the server from the second client, a third difference notification indicating changes made to the co-edited text by the second client reflecting a conflict resolution process between the second client version and the first difference notification; and

updating, at the server, the first updated master version with the third difference notification to produce a second updated master version of the co-edited text.

16. The method of claim 15, wherein the first difference notification indicates a delta between the first client version of the co-edited text and the master version of the text as understood by the first client in response to changes made to the first client version of the co-edited text by the first client.

17. The method of claim 15, wherein the first update notification indicates to the first client that the first difference notification was selected.

18. The method of claim 15, wherein the first update notification indicates to the second client that the second difference notification was not selected and that the conflict resolution process is to be executed by the second client.

19. The method of claim 15, wherein the first difference notification is selected, and the second difference notification is discarded, based on the server receiving the first difference notification before receiving the second difference notification.

20. The method of claim 15, further comprising, after receiving the third difference notification:

receiving, at the server from the first client, a fourth difference notification indicating changes made to the co-edited text by the first client in the first client version after the first difference notification was transmitted by the first client; and

in response to selecting the third difference notification, discarding, at the server, the fourth difference notification.