Sun Microsystems, Inc.

Oracle America, Inc.

Vijay Balasubramanian

Aseem Sharma

Nidheesh Dubey

Brian Holtz

Vivek Pandey

The embodiments of the present invention provide a method for comparing file tree descriptions and generating a sequenced log of changes that transform an old file tree to a new file tree. According to one embodiment, the inputs to this comparator are two tree-structured descriptions called file tree indices, and the outputs are a sequence of file tree operations that can transform the old tree to the current tree. According to another embodiment, the comparator has two top level steps, where at step one it recursively goes through the old file tree index and compares each folder along with its children with that of the corresponding file tree generating a raw operation log, and at step two after the recursion is done, the comparator processes the raw operation log and optimizes certain sets of operations by transforming them into single operations.

Method and system for comparing and updating file trees

The embodiments of the present invention provide a method for resolving conflicting changes encountered when reconciling parallel user changes to two synchronized trees of folders and files. According to one embodiment, these conflicts are presented to the user as an interface that requires an indication from the user to the winner of the conflict. According to another embodiment, since certain conflicts cannot be resolved independently, they have to be combined and presented to the user as a single conflict. According to yet another embodiment, after the user has indicated which operations are the winners of all or some of the conflicts, the winning operations are applied to the file tree with which they are in conflict.

File tree conflict processor

Methods and systems are provided for reconciling any changes that have occurred in two file trees since they were last synchronized. A reconciler takes as input two logs of the changes made in the respective file trees. The first log resides on a client computing device, and the second log resides on a server computing device. The reconciler outputs two sets of changes that need to be applied to the respective file trees in order to synchronize them. The reconciler detects and outputs a list of changes that conflict with each other.

Growing community of inventors

San Jose, CA, United States of America

Vijay Balasubramanian