Method and system for automatically detecting collision and selecting updated versions of a set of files

• US 6,226,652 B1
• Filed: 09/05/1997
• Issued: 05/01/2001
• Est. Priority Date: 09/05/1997
• Status: Expired due to Fees

• Current Assignee: International Business Machines Corporation
• Original Assignee: International Business Machines Corporation
• Inventors: Percival, Lynn Cleveland, Scanlon, John Lane
• Primary Examiner(s): Breene, John
• Assistant Examiner(s): CHANNAVAJJALA, SRIRAMA T
• Application Number:
  US08/923,910
• Time in Patent Office: 1,334 Days
• Field of Search: 707/1-10, 707/100-106, 707/200-206, 707/500, 707/511, 707/526, 345/333-340, 345/348, 345/343, 345/302, 345/252, 717/11
• US Class Current: 707/695
• CPC Class Codes: G06F 16/10 File systems; File servers
• CPC Class Codes: G06F 8/71 Version control security arrangements therefor G06F21/57; Configuration management
• CPC Class Codes: Y10S 707/99953 Recoverability
• CPC Class Codes: Y10S 707/99954 Version management

Abstract

A list of various versions of file sets that need to be reconciled (collisions) are automatically loaded into a collision handler. The user works through the list, resolving differences by selecting one of the files or by merging several of them through selection and modification, as required. The user is provided with buttons that allow rapid changes between different styles of views (Split, Composite, Split-Merge, Composite-Merge) which allows the user to see the files in a number of different ways to further facilitate the process.

Claims

1. A method of merging a plurality of various versions of a set of computer files, comprising the steps of:

detecting a collision between the data contained in computer files in the plurality of various versions of the set of computer files;

automatically loading each of the plurality of various versions of the set of computer files for which a collision was detected into a collision handler, without user intervention and in response to the detection of a collision between computer files in the plurality of various versions of the set of computer files;

displaying data from said versions for which a collision was detected with said collision handler so as to highlight the differences between the data of said versions by concurrently displaying the data of the plurality of versions of a set of computer files;

resolving a first difference between said versions by accepting a graphical selection of a preferred one of said displayed data from said versions;

then

automatically displaying a next difference after the first difference is resolved so as to allow the user to graphically select a preferred one of the displayed data from the versions corresponding to the next difference; and

storing a version of the loaded computer files having the differences resolved as selected by the user.

2. A method according to claim 1, further comprising the steps of:

providing a plurality of view options to a user of the collision handler so as to allow the user to select the view option with which to concurrently display data from at least two of the loaded computer files associated with the detected collisions between the computer files loaded in the collision handler;

obtaining user input to select the view option from the plurality of view options; and

wherein the step of displaying comprises the step of displaying data from said versions for which a collision was detected with said collision handler utilizing the selected view option so as to highlight the differences between the data of said versions by concurrently displaying the data of the plurality of versions of a set of computer files.

3. The method of claim 2, wherein the plurality of view options includes a composite view, said step of displaying further comprises:

displaying data from said versions in a composite view if the obtained user input selects the composite view view.

4. The method of claim 2, wherein the plurality of view options includes a split-merge view, said step of displaying further comprises:

displaying data from said versions in a split-merge view if the obtained user input selects the split-merge view.

5. The method of claim 2, wherein the plurality of view options includes a composite-merge view, said step of displaying further comprises:

displaying data from said versions in a composite-merge view if the obtained user input selects the composite-merge view.

6. The method of claim 2, wherein the plurality of view options includes a split view, said step of displaying further comprises:

displaying data from said versions in a composite view if the obtained user input selects the split view.

7. A system for merging a plurality of various versions of a set of computer files, comprising:

means for detecting a collision between the data contained in computer files in the plurality of various versions of the set of computer files;

means for automatically loading each of the plurality of various versions of the set of computer files for which a collision was detected into a collision handler, without user intervention and in response to the detection of a collision between computer files in the plurality of various versions of the set of computer files;

means for displaying data from said versions for which a collision was detected with said collision handler so as to highlight the differences between the data of said versions by concurrently displaying the data of the plurality of versions of a set of computer files;

means for resolving a first difference between said versions by accepting a graphical selection of a preferred one of said displayed data from said versions;

then

means for automatically displaying a next difference after the first difference is resolved so as to allow the user to graphically select a preferred one of the displayed data from the versions corresponding to the next difference; and

means for storing a version of the loaded computer files having the differences resolved as selected by the user.

8. A system according to claim 7, further comprising:

means for providing a plurality of view options to a user of the collision handler so as to allow the user to select the view option with which to concurrently display data from at least two of the loaded computer files associated with the detected collisions between the computer files loaded in the collision handler;

means for obtaining user input to select the view option from the plurality of view options; and

wherein the means for displaying comprises means for displaying data from said versions for which a collision was detected with said collision handler utilizing the selected view option so as to highlight the differences between the data of said versions by concurrently displaying the data of the plurality of versions of a set of computer files.

9. The system of claim 8, wherein the plurality of view options includes a split-merge view said means for displaying further comprises:

means for displaying said versions in a split-merge view if the obtained user input selects the split-merge view.

10. The system of claim 8, wherein the plurality of view options includes a composite-merge view, said means for displaying further comprises:

means for displaying said versions in a composite-merge view if the obtained user input selects the composite-merge view.

11. The system of claim 8, wherein the plurality of view options includes a composite view said means for displaying further comprises:

means for displaying said versions in a composite view if the obtained user input selects the composite view.

12. The system of claim 8, wherein the plurality of view options includes a split view, said means for displaying further comprises:

means for displaying said versions in a split view if obtained user input selects the split view.

13. A computer program product recorded on computer readable medium for merging a plurality of various versions of a set of computer files, comprising:

computer readable means for detecting a collision between the data contained in computer files in the plurality of various versions of the set of computer files;

computer readable means for automatically loading each of the plurality of various versions of the set of computer files for which a collision was detected into a collision handler, without user intervention and in response to the detection of a collision between computer files in the plurality of various versions of the set of computer files;

computer readable means for displaying data from said versions for which a collision was detected with said collision handler so as to highlight the differences between the data of said versions by concurrently displaying the data of the plurality of versions of a set of computer files;

computer readable means for resolving a first difference between said versions by accepting a graphical selection of a preferred one of said displayed data from said versions;

then

computer readable means for automatically displaying a next difference after the first difference is resolved so as to allow the user to graphically select a preferred one of the displayed data from the versions corresponding to the next difference; and

computer readable means for storing a version of the loaded computer files having the differences resolved as selected by the user.

14. A computer program product according to claim 13, further comprising:

computer readable means for providing a plurality of view options to a user of the collision handler so as to allow the user to select the view option with which to concurrently display data from at least two of the loaded computer files associated with the detected collisions between the computer files loaded in the collision handler;

computer readable means for obtaining user input to select the view option from the plurality of view options; and

wherein the computer readable means for displaying comprises computer readable means for displaying data from said versions for which a collision was detected with said collision handler utilizing the selected view option so as to highlight the differences between the data of said versions by concurrently displaying the data of the plurality of versions of a set of computer files.

15. The program product of claim 14, wherein the plurality of view options includes a composite-merge view, said computer readable means for displaying further comprises:

computer readable means for displaying said versions in a composite-merge view if the user input selects the composite-merge view.

16. The program product of claim 14, wherein the plurality of view options includes a split-merge view, said computer readable means for displaying further comprises:

computer readable means for displaying said versions in a split-merge view if the user input selects the split-merge view.

17. The program product of claim 14, wherein the plurality of view options includes a composite view, said computer readable means for displaying further comprises:

computer readable means for displaying said versions in a composite view if the user input selects the composite view.

18. The program product of claim 14, wherein the plurality of view options includes a split view, said computer readable means for displaying further comprises:

computer readable means for displaying said versions in a split view if the user input selects the split view.