Comparison of hierarchical structures and merging of differences

• US 6,848,078 B1
• Filed: 11/10/1999
• Issued: 01/25/2005
• Est. Priority Date: 11/30/1998
• Status: Expired due to Fees

• Current Assignee: International Business Machines Corporation
• Original Assignee: International Business Machines Corporation
• Inventors: Birsan, Dorian, Sluiman, Harm
• Primary Examiner(s): Shah, Sanjiv
• Application Number:
  US09/437,619
• Time in Patent Office: 1,903 Days
• Field of Search: 715/511, 715/513, 715/514, 707/203
• US Class Current: 715/206
• CPC Class Codes: G06F 16/904 Browsing; Visualisation therefor for navigating the web G06F16/954; browsing optimisation for the web G06F16/957
• CPC Class Codes: Y10S 707/99953 Recoverability
• CPC Class Codes: Y10S 707/99954 Version management

Abstract

A software tool to allow a user to compare a base file containing XML statements to a modified file and from the comparison, create a third file. The comparison between the base and modified files results in a comparison tree which contains, as nodes, all of the information in the base file as well as the differences located in the modified file. Differences between the nodes of the two files are highlighted in a comparison tree and the user may resolve the differences to create a third file or optionally incorporate the selected differences into the base file. As nodes are examined in the comparison tree and decisions made as to which nodes to include in the third file, differences in the comparison tree are resolved. As a difference is resolved, any node in the comparison tree dependent upon the now resolved difference is no longer highlighted if it too has had the difference resolved. The tool is most commonly used to determine changes made to a source code base file and allows the individual maintaining a stable source code base to determine if the changes in the modified file should be integrated into the base file.

Claims

1. A method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of:

comparing the elements of a base file to the elements of a modified file;

displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files;

highlighting, in the tree structure, the differences between said elements of said base and said modified files;

allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file;

indicating to the user, in the tree structure, differences between elements by one of the identifiers;

new, changed or removed; and

for an element identified as new, providing the user with the following options;

a) do not use the new element, whereby the new element is not incorporated into said merged file; and

b) use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file.

2. The method of claim 1, wherein displaying the tree structure comprises displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file.

3. The method of claim 2 which includes, when the user selects an element of the tree structure displayed in the first pane, displaying the source code for the selected element:

a) in the second pane if the selected element exists in the base file; and

b) in the third pane if the selected element exists in the modified file.

4. The method of claim 1 wherein the step of comparing uses an ID attribute of the elements of the base file and the modified file being compared.

5. The method of claim 1 wherein the step of comparing uses a name attribute of the elements of the base file and the modified file being compared.

6. The method of claim 1 wherein said hierarchically structured files are XML (extensible Markup Language) files.

7. A program storage device readable by a data processing system, tangibly embodying a program of instructions, executable by said data processing system to perform the method steps of claim 1.

8. The method of claim 1, wherein:

the step of comparing comprises comparing information associated with at least one of the elements of the base file with information associated with at least one of the elements of the modified file;

the information associated with the at least one of the elements of the base file identifies attributes of the at least one of the elements of the base file; and

the information associated with the at least one of the elements of the modified file identifies attributes of the at least one of the elements of the modified file.

9. The method of claim 8, wherein:

the information associated with the at least one of the elements of the base file further identifies attributes of descendant elements thereof, if any;

the information associated with the at least one of the elements of the modified file further identifies attributes of descendant elements thereof, if any.

10. The method of claim 8, wherein:

the information associated with the at least one of the elements of the base file comprises information encoded by a digest function; and

the information associated with the at least one of the elements of the modified file comprises information encoded by the digest function.

11. The method of claim 1, further comprising:

identifying at least one of the elements of the base file and the modified file according to a user-customizable identity function.

12. A system for identifying to a user, the differences between elements of two hierarchically structured files, comprising:

means for comparing the elements of a base file to the elements of a modified file;

means for displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files;

means for highlighting, in the tree structure, the differences between said elements of said base and said modified files;

means for allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file;

means for indicating to the user, in the tree structure, differences between elements by one of the identifiers;

new, changed or removed; and

for an element identified as new, means for providing the user with the following options;

a) do not use the new element, whereby the new element is not incorporated into said merged file; and

b) use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file.

13. The system of claim 12, wherein the means for displaying the tree structure comprises means for displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file.

14. The system of claim 13 which includes, when the user selects an element of the tree structure displayed in the first pane, means for displaying the source code for the selected element:

a) in the second pane if the selected element exists in the base file; and

b) in the third pane if the selected element exists in the modified file.

15. The system of claim 12 wherein the means for comparing uses an ID attribute of the elements of the base file and the modified file being compared.

16. The system of claim 12 wherein the means for comparing uses a name attribute of the elements of the base file and the modified file being compared.

17. The system of claim 12 wherein said hierarchically structured files are XML (extensible Markup Language) files.

18. The system of claim 12, wherein:

the means for comparing comprises means for comparing information associated with at least one of the elements of the base file with information associated with at least one of the elements of the modified file;

the information associated with the at least one of the elements of the base file identifies attributes of the at least one of the elements of the base file; and

the information associated with the at least one of the elements of the modified file identifies attributes of the at least one of the elements of the modified file.

19. The system of claim 18, wherein:

the information associated with the at least one of the elements of the base file further identifies attributes of descendant elements thereof, if any;

the information associated with the at least one of the elements of the modified file further identifies attributes of descendant elements thereof, if any.

20. The system of claim 18, wherein:

the information associated with the at least one of the elements of the base file comprises information encoded by a digest function; and

the information associated with the at least one of the elements of the modified file comprises information encoded by the digest function.

21. The system of claim 12, further comprising:

means for identifying at least one of the elements of the base file and the modified file according to a user-customizable identity function.

22. A method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of:

comparing the elements of a base file to the elements of a modified file;

displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files;

highlighting, in the tree structure, the differences between said elements of said base and said modified files;

allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file;

indicating to the user, in the tree structure, differences between elements by one of the identifiers;

new, changed or removed; and

for an element identified as changed, providing the user with the following options;

a) use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and

b) use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.

23. A method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of:

comparing the elements of a base file to the elements of a modified file;

displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files;

highlighting, in the tree structure, the differences between said elements of said base and said modified files;

allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file;

indicating to the user, in the tree structure, differences between elements by one of the identifiers;

new, changed or removed; and

for an element identified as removed, providing the user with the following options;

a) do not delete, whereby the merged file has the element as it exists in the base file; and

b) delete from the base file, whereby the merged file does not have the element that was deleted from the base file.

24. A method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of:

comparing the elements of a base file to the elements of a modified file;

displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files; and

highlighting, in the tree structure, the differences between said elements of said base and said modified files;

wherein said hierarchically structured files are XML (eXtensible markup language) files and wherein the step of comparing uses;

if provided by the elements of the base and modified files being compared, an attribute of type ID;

if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <

Uuid>

tag if provided by the elements of the base and modified files being compared;

if an attribute of type ID and a <

Uuid>

tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared; and

if an attribute of type ID, a <

Uuid>

tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.

25. A system for identifying to a user, the differences between elements of two hierarchically structured files, comprising:

means for comparing the elements of a base file to the elements of a modified file;

means for displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files;

means for highlighting, in the tree structure, the differences between said elements of said base and said modified files;

means for allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file;

means for indicating to the user, in the tree structure, differences between elements by one of the identifiers;

new, changed or removed; and

for an element identified as changed, means for providing the user with the following options;

a) use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and

b) use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.

26. A system for identifying to a user, the differences between elements of two hierarchically structured files, comprising:

means for comparing the elements of a base file to the elements of a modified file;

means for displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files;

means for highlighting, in the tree structure, the differences between said elements of said base and said modified files;

means for allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file;

means for indicating to the user, in the tree structure, differences between elements by one of the identifiers;

new, changed or removed; and

for an element identified as removed, means for providing the user with the following options;

a) do not delete, whereby the merged file has the element as it exists in the base file; and

b) delete from the base file, whereby the merged file does not have the element that was deleted from the base file.

27. A system for identifying to a user, the differences between elements of two hierarchically structured files, comprising:

means for comparing the elements of a base file to the elements of a modified file;

means for displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files; and

means for highlighting, in the tree structure, the differences between said elements of said base and said modified files;

wherein said hierarchically structured files are XML (eXtensible markup language) files and wherein the means for comparing uses;

if provided by the elements of the base and modified files being compared, an attribute of type ID;

if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <

Uuid>

tag if provided by the elements of the base and modified files being compared;

if an attribute of type ID and a <

Uuid>

tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared; and

if an attribute of type ID a <

Uuid>

tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.