Conflict management in a versioned file system
First Claim
Patent Images
1. A system comprising:
- a server accessible by a client over a network, the server operable to;
group a plurality of files as a single version unit to form a fusion unit on the server;
expose the fusion unit to the client as a browsable folder having separate files;
receive an indication of a change to a file belonging to the fusion unit;
determine whether the indicated change to the file causes a conflict for the fusion unit; and
report the conflict for the fusion unit if the indicated change to the file causes the conflict for the fusion unit, else update the fusion unit on the server to incorporate the indicated change to the file; and
a storage unit, coupled to the server, to store the fusion unit.
2 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.
7 Citations
17 Claims
-
1. A system comprising:
-
a server accessible by a client over a network, the server operable to; group a plurality of files as a single version unit to form a fusion unit on the server; expose the fusion unit to the client as a browsable folder having separate files; receive an indication of a change to a file belonging to the fusion unit; determine whether the indicated change to the file causes a conflict for the fusion unit; and report the conflict for the fusion unit if the indicated change to the file causes the conflict for the fusion unit, else update the fusion unit on the server to incorporate the indicated change to the file; and a storage unit, coupled to the server, to store the fusion unit. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17)
-
Specification