Asynchronous Replication
First Claim
1. A method for providing asynchronous replication, the method comprising:
- saving contents of a copy of a server file to a down load file, a base file, and a working file;
receiving an indication from an application that the application has edited the working file;
saving, in response to the indication, a copy of the edited working file to an upload file;
querying a server computer to determine if the server file on the server computer has been changed;
when it is determined that the server file on the server computer has not been changed, updating the server file on the server computer with contents of the upload file; and
when it is determined that the server file on the server computer has been changed,performing a three-way merge of the upload file, the base file, and the changed server file on the server computer, andupdating the server file on the server computer with results of the three-way merge.
2 Assignments
0 Petitions
Accused Products
Abstract
Contents of a copy of a server file may be saved to a down load file, a base file, and a working file. An indication may be received from an application that the application has edited the working file and a copy of the edited working file may be saved to an upload file. A server computer may be queried to determine if the server file on the server computer has been changed. If the server file on the server computer has not been changed, the server file on the server computer may be updated with contents of the upload file. If the server file on the server computer has been changed, a three-way merge of the upload file, the base file, and the changed server file on the server computer may be performed. Then the server file on the server computer may be updated with the three-way merge results.
29 Citations
20 Claims
-
1. A method for providing asynchronous replication, the method comprising:
-
saving contents of a copy of a server file to a down load file, a base file, and a working file; receiving an indication from an application that the application has edited the working file; saving, in response to the indication, a copy of the edited working file to an upload file; querying a server computer to determine if the server file on the server computer has been changed; when it is determined that the server file on the server computer has not been changed, updating the server file on the server computer with contents of the upload file; and when it is determined that the server file on the server computer has been changed, performing a three-way merge of the upload file, the base file, and the changed server file on the server computer, and updating the server file on the server computer with results of the three-way merge. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)
-
-
19. A computer-readable medium which stores a set of instructions which when executed performs a method for providing asynchronous replication, the method executed by the set of instructions comprising:
-
receiving, from an application, a request for a copy of a server file; requesting the copy of the server file from a server computer; receiving the copy of the server file from the server computer; saving contents of the copy of the server file to a down load file, a base file, and a working file; receiving an indication from the application that the application has edited the working file; saving, in response to the indication, a copy of the edited working file to an upload file; querying the server computer to determine if the server file on the server computer has been changed; when it is determined that the server file on the server computer has not been changed, updating the server file on the server computer with contents of the upload file; and when it is determined that the server file on the server computer has been changed, performing a three-way merge of the upload file, the base file, and the changed server file on the server computer, updating the server file on the server computer with results of the three-way merge, and replacing the contents of the down load file and the base file with the results of the three-way merge.
-
-
20. A system for providing asynchronous replication, the system comprising:
-
a memory storage; and a processing unit coupled to the memory storage, wherein the processing unit is operative to; save a copy of an edited working file to an upload file; when it is determined that a server file on a server computer has not been changed, update the server file on the server computer with contents of the upload file; and when it is determined that the server file on the server computer has been changed, perform a three-way merge of the upload file, a base file, and the changed server file on the server computer, and update the server file on the server computer with results of the three-way merge.
-
Specification