Conflict management in a versioned file system
First Claim
Patent Images
1. A method comprising:
- grouping a plurality of files as a single version unit to form a fusion unit on a server;
exposing the fusion unit to a client as a browsable folder having separate files;
receiving an indication of a change to a file belonging to the fusion unit;
determining whether the indicated change to the file causes a conflict for the fusion unit; and
reporting the conflict for the fusion unit if the indicated change to the file causes the conflict for the fusion unit, else updating the fusion unit on the server to incorporate the indicated change to the file, wherein the conflict can only exist for the fusion unit.
3 Assignments
0 Petitions
Accused Products
Abstract
Multiple files in a versioned file system are grouped to form a fusion unit on a server. The fusion unit is exposed to a client as a browsable folder having separate files. When the server receives an indication of a change to file belonging to the fusion unit, the server determines whether the change to the file causes a conflict on the fusion unit. If the change does cause a conflict, then the conflict is reported; otherwise the fusion unit is updated to incorporate the change.
-
Citations
20 Claims
-
1. A method comprising:
-
grouping a plurality of files as a single version unit to form a fusion unit on a server; exposing the fusion unit to a client as a browsable folder having separate files; receiving an indication of a change to a file belonging to the fusion unit; determining whether the indicated change to the file causes a conflict for the fusion unit; and reporting the conflict for the fusion unit if the indicated change to the file causes the conflict for the fusion unit, else updating the fusion unit on the server to incorporate the indicated change to the file, wherein the conflict can only exist for the fusion unit. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10, 11)
-
-
12. An article of manufacture comprising a computer-readable medium having content stored thereon to provide instructions to result in an electronic device performing operations including:
-
grouping a plurality of files as a single version unit to form a fusion unit on a server; exposing the fusion unit to a client as a browsable folder having separate files; receiving an indication of a change to a file belonging to the fusion unit; determining whether the indicated change to the file causes a conflict for the fusion unit; and reporting the conflict for the fusion unit if the indicated change to the file causes the conflict for the fusion unit, else updating the fusion unit on the server to incorporate the indicated change to the file, wherein the conflict can only exist for the fusion unit. - View Dependent Claims (13, 14, 15, 16, 17, 18, 19, 20)
-
Specification