File tree conflict processor

• US 7,165,248 B2
• Filed: 12/12/2001
• Issued: 01/16/2007
• Est. Priority Date: 06/04/2001
• Status: Active Grant

• Current Assignee: Oracle America, Inc. (Oracle Corporation)
• Original Assignee: Sun Microsystems Incorporated (Oracle Corporation)
• Inventors: Pandey, Vivek, Holtz, Brian, Dubey, Nidheesh, Sharma, Aseem, Balasubramanian, Vijay
• Primary Examiner(s): Zhen; Wei
• Assistant Examiner(s): CHOW, CHIH CHING
• Application Number:
  US10/023,378
• Publication Number:
  US 20040015456A1
• Time in Patent Office: 1,861 Days
• Field of Search: 707/8, 707/1, 707/202
• US Class Current: 717/170
• CPC Class Codes: G06F 16/1787 Details of non-transparently synchronising file systems
• CPC Class Codes: Y10S 707/99931 Database or file accessing
• CPC Class Codes: Y10S 707/99938 Concurrency, e.g. lock management in shared database

Abstract

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.

Claims

1. A computer-implemented method for processing conflicts in a first and second file tree comprising:

presenting one or more conflicts to a user;

presenting more than one unresolved independent conflicts as a single conflict to said user, wherein said more than one unresolved independent conflicts are file tree conflicts determined from a comparison of the first and second file trees;

obtaining input from said user; and

handling said one or more conflicts and said single conflict based on said input, wherein one or more winning conflicts are applied to a file tree with which they were in conflict, and wherein

if said winning conflicts are server operations, said server operations are translated back up a conflict list across previous server operations, and then down a conflict list across client operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage, and

if said winning conflicts are client operations, said client operations are translated back up a conflict list across previous client operations, and then down the conflict list across server operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage.

2. The method of claim 1 wherein said winning server operations are en-queued for transmission to the client.

3. The method of claim 1 wherein said winning client operations are applied against said server'"'"'s filesystem.

4. An article of manufacture comprising:

a computer storage medium having computer readable program code embodied therein for processing conflicts in a first and second file tree, said computer readable program code in said article of manufacture comprising;

computer readable program code configured to cause said computer to present one or more conflicts to a user;

computer readable program code configured to cause said computer to present more than one unresolved independent conflicts as a single conflict to said user, wherein said more than one unresolved independent conflicts are file tree conflicts determined from a comparison of the first and second file trees;

computer readable program code configured to cause said computer to obtain input from said user; and

computer readable program code configured to cause said computer to handle said one or more conflicts and said single conflict based on said input, wherein one or more winning conflicts are applied to a file tree with which they were in conflict, and wherein

if said winning conflicts are server operations, said server operations are translated back up a conflict list across previous server operations, and then down a conflict list across client operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage, and

if said winning conflicts are client operations, said client operations are translated back up a conflict list across previous client operations, and then down the conflict list across server operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage.

5. The article of manufacture of claim 4 wherein said winning server operations are en-queued for transmission to the client.

6. The article of manufacture of claim 4 wherein said winning client operations are applied against said server'"'"'s filesystem.

7. A computer program product comprising:

a computer storage medium having computer readable program code embodied therein configured to process conflicts in a first and second file tree, said computer program product comprising;

computer readable code configured therein to cause a computer to present one or more conflicts to a user;

computer readable code configured therein to cause a computer to present more than one unresolved independent conflicts as a single conflict to said user, wherein said more than one unresolved independent conflicts are file tree conflicts determined from a comparison of the first and second file trees;

computer readable code configured therein to cause a computer to obtain input from said user; and

computer readable code configured therein to cause a computer to handle said one or more conflicts and said single conflict based on said input, wherein one or more winning conflicts are applied to a file tree with which they were in conflict, and wherein

if said winning conflicts are server operations, said server operations are translated back up a conflict list across previous server operations, and then down a conflict list across client operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage, and

if said winning conflicts are client operations, said client operations are translated back up a conflict list across previous client operations, and then down the conflict list across server operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage.

8. The computer program product of claim 7 wherein said winning server operations are en-queued for transmission to the client.

9. The computer program product of claim 7 wherein said winning client operations are applied against said server'"'"'s filesystem.