Data processing: database and file management or data structures – Database design – Data structure types
Reexamination Certificate
1997-09-05
2001-05-01
Breene, John (Department: 2777)
Data processing: database and file management or data structures
Database design
Data structure types
C707S793000, C707S793000, C717S152000, C345S215000, C345S215000
Reexamination Certificate
active
06226652
ABSTRACT:
FIELD OF THE INVENTION
This invention relates in general to computer software, and in particular to a method and system for automatically notifying a user that a file has been changed/updated by several different persons at the same time in order to allow the various versions to be reconciled.
BACKGROUND OF THE INVENTION
In a programming environment, programmers may check out a file to write new programming, to change/update and/or debug. With the use of library type storage systems, this may be done by several different programmers simultaneously. Thus, if each person makes one or more changes, the others may not know what has been done. When the files are returned to the library from the various programmers, there will be no single correct and updated version.
Currently there are tools that allow a user to merge one set of changed files at a time, however, the user is required to determine how many sets there are and work through them keeping track of changes manually. Obviously, this is time consuming and prone to error. Other tools may automatically determine all the relevant sets of files that need to be updated, but the user must still work through these sets manually.
Thus, there is a need for a method and system for automatically selecting updated versions of a file and resolving conflicts therein.
SUMMARY OF THE INVENTION
The present invention relates to a method and system for merging a plurality of varying versions of a set of computer files which greatly reduces problems associated with the prior art. The present invention allows a user to visually select the proper version of any collision without the need to manually keep track of where a change may be needed.
In accordance with one embodiment of the present invention, a plurality of various versions of a computer file are merged. Each of the plurality of various versions are automatically loaded into a collision handler. The various versions are then displayed to the user with the collision handler. The user may then resolve any differences between the various versions by visually selecting a preferred one of the versions.
The versions may be displayed to the user in any of a plurality of views in accordance with the users preference. The views are: split, composite, split-merge and composite-merge.
The solution as provided herein takes a list of file sets that have to be reconciled (collisions) and loads them into the collision handler. Then the user works through the list, resolving the 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 them to rapidly change between views (Split, Composite, Split-Merge, Composite-Merge). This allows the user to see the files in a number of different ways to further facilitate the process.
These and other features, aspects, and advantages of the present invention will become better understood with reference to the following description, appended claims, and accompanying drawings.
REFERENCES:
patent: 5481722 (1996-01-01), Skinner
patent: 5555409 (1996-09-01), Leenstra, Sr. et al.
patent: 5598208 (1997-01-01), McClintock
patent: 5671428 (1997-09-01), Muranaga et al.
patent: 5737740 (1998-04-01), Henderson et al.
patent: 5765176 (1998-06-01), Bloomberg
patent: 5787280 (1998-07-01), Joseph et al.
patent: 5799315 (1998-08-01), Rainey et al.
patent: 5806078 (1998-09-01), Hug et al.
patent: 5845293 (1998-12-01), Veghte et al.
Koike, H et al., VRCS:integrating version control and module management using interactive three-dimensional graphics, visual languages, Sep. 1997, proceedings, IEEE, and 168-173.
Percival Lynn Cleveland
Scanlon John Lane
Breene John
Channavajjala Srirama
Clay A. Bruce
International Business Machines Corp.
Myers Bigel & Sibley Sajovec, PA
LandOfFree
Method and system for automatically detecting collision and... does not yet have a rating. At this time, there are no reviews or comments for this patent.
If you have personal experience with Method and system for automatically detecting collision and..., we encourage you to share that experience with our LandOfFree.com community. Your opinion is very important and Method and system for automatically detecting collision and... will most certainly appreciate the feedback.
Profile ID: LFUS-PAI-O-2482918