JP2740473B2 - Version restoration method - Google Patents

Description

DETAILED DESCRIPTION OF THE INVENTION

[0001]

BACKGROUND OF THE INVENTION 1. Field of the Invention The present invention relates to a version restoring method in a version management system, and more particularly to a method for restoring a plurality of versions.

[0002]

2. Description of the Related Art A conventional version control system is a UNIX version.
Two systems are well known, CCS and RCS.
These systems manage versions in the following ways.

First, when the next version is registered based on the first version, a difference from the first version is extracted and difference data, that is, a row added to the previous version line by line. Then, it creates an extract of the deleted line and saves it in the difference file along with the parent-child relationship of the version. Version registration, update retrieval, reference retrieval, and deletion are processed individually for each version. Versions can be modified based on any version, so in an update extraction, besides extracting the first version as a revision,
It can handle the extraction as a revision that branches from the old version. In the registration process, the previous version is restored, the difference is created from the text to be registered, and difference data is created and registered. The difference processing restores the child's version while referring to the difference data in order from the first version, repeats the restoration processing until the target version, and outputs the file. In the process of deleting unnecessary versions in the difference file, if there is no own child, simply delete the version, and if there is a child, restore the parent and child and extract the difference data between them, After replacing the difference data with it, delete the target version.

[0004] As described above, restoration / registration processing is required at all times of registration / deletion / removal.

Next, a conventional plate restoration process will be described with reference to FIG. First, it is checked whether or not a target version node exists (step 20). If so, a base node is extracted (step 21). Since there is no difference in the base node, the restoration process 22 is not performed. Next, the restoration process is repeated until a version node designated to be restored is found (steps 22 to 24). Restoration processing (step 2
If the node has difference data, 2) restores its own complete text from the complete text of the previous node and its own difference. Returning to step 20, the process is repeated until the designated version node ends.

[0006]

In the above-mentioned conventional plate restoring method, since each plate is individually processed, as shown in a flowchart of FIG. 7, a child is restored when a plurality of plates are restored at once. There is a disadvantage that the processing (step 22) is repeatedly performed many times, resulting in poor processing efficiency.

[0007]

A first aspect of the present invention is a version management system for managing a text of a program or the like in a version, wherein only the first version is managed in a text, and the versions after the first are defined as the version and the version. In a version restoring method in a version management system that manages only difference data from a previous version of a version, when restoring a plurality of versions specified in advance, when a plurality of versions specified in advance are duplicated from the first version to the specified versions. The plate is characterized in that the restoration processing is not duplicated.

A second invention is a version management system for managing texts such as programs in a version. The version management system manages text only in a first version, and a version after the first version includes the version and a version before the version. In a version restoring method in a version management system that manages only difference data from a version, when restoring a plurality of versions specified in advance, searching for a path from the first version to the specified versions, Marking from the first version to the specified plurality of versions in the searched path, and then performing the restoration process in each version from the first version with the mark so as not to overlap the specified version. The restoration processing is performed up to a plurality of versions to improve the efficiency of the restoration processing.

[0009]

Next, the present invention will be described with reference to the drawings.

FIG. 1 is a flowchart showing an embodiment of the plate restoring method according to the present invention.

[0011] In the version management system according to the present invention, the complete text as a base is managed only for the first version, and only the difference data is managed for other than the base version.

FIG. 2 is a block diagram showing an embodiment of the version management system according to the present invention. The difference file 32 is developed in the memory 37 by the difference management file reading unit 34.

FIG. 3 is a diagram showing an example of the configuration of a differential file developed in the memory 37. Version nodes 41 to 45 and version nodes 47 to 48 each represent one version, and the base pointer 40 Base version node 41
With a pointer to The branch node 46
This indicates that the version node 47 is derived with the version node 42 as a parent.

FIG. 4 is a diagram showing an example of the structure of the version management information in the version node. The version node has a version ID (VID) 51 uniquely identified in the difference file, a mark flag 52, and a complete text. Pointer 53 (only the base version node), pointer 54 to the difference data
(Version node other than base), pointer 55 to branch node, pointer 5 to child version created based on self
6. It has a pointer 57 to the parent version from which it was created. If there is no target for each pointer, a null pointer (a pointer with a value of 0) is set.

FIG. 5 is a diagram showing an example of the management information of the branch node 46. The pointer 61 points to the version node of the child who has branched, and the pointer 62 points to the next branch node.
have.

The plate processing unit 35 performs four processes of "registration", "reference retrieval", "update retrieval", and "deletion".

"Update retrieval" is a retrieval operation performed when a text is corrected based on a certain version. In order to automatically manage the editions, the edition management system adds a new edition node as a child of the designated edition when an "update retrieval" is requested (this edition node is added by the edition ID
Do it for a reservation. No one can retrieve the reserved version until the retrieved text is registered. ),
Version I of the newly created version node at the beginning of the text
Insert a special record with D, restore the version and output. This record is created in a head area that cannot be updated by the editor.

"Reference retrieval" is a retrieval process for purposes other than updating. No version node is added, and a text having the version ID of the specified version is output. Even if an attempt is made to "register" the reference-extracted text, the pointer to the difference data of the version node is not a null pointer, so the version processing unit 35 returns an error message indicating that "this is not an updated and retrieved version".

When "delete" is requested for a specific version ID, if the version has no children, the version processing unit simply deletes the version node. If the version node has a child, the previous version and the child version are restored, the difference between the two is extracted, and the difference data is extracted. delete.

In the version management system, when the processing of the version processing unit 35 is completed, the information in the memory is output as the difference file 32 by the difference file output unit 36.

A plurality of restoration processes performed by the plate processing unit 35 when a plurality of processes are designated will be described with reference to the flowchart of FIG.

FIG. 6 is an explanatory diagram for explaining the plurality of restoration processes. A case where the version node 85 and the version node 87 are simultaneously restored will be described. In the restoration processing, the version IDs of the version nodes 85 and 87 are given as parameters (see FIG. 6, 1.2.1.1 and 1.2.
2.1).

First, it is checked whether there is a target version node (step 10), and if there is, a base node is taken out (step 11). Base pointer 8 in FIG.
From the base node 81 indicated by 0, the version node 8 to be restored
Search for 5. The search processing is performed with priority given to the pointer to the child, and the pointers to the version nodes 81 and 82 requiring the restoration processing are stored in the stack 89 (step 13). If the version ID is checked (step 12) and the specified version node 85 is found, all version nodes stored in the stack 89 and flags in the version node 85 are marked (step 14), and another version node is set. The search for 87 is continued. With the processing so far, the path from the designated version node 85 and version node 87 to the base node 80 can be marked.

After marking the version nodes required for all restoration processing, restoration processing is performed next. In the restoration process, the restoration process (step 19) of the marked version node is repeated. That is, the base node to the first version node 85 to be restored, that is, the version node 81 indicated by the base pointer 80 in FIG. 6 is extracted (step 17), and the complete text to be restored is converted into the version management information shown in FIG. Eject from the pointer 53 points to the area to the full text in
You. The text of each version node is restored by adding difference data to the extracted complete text, a pointer to the text is set in the complete text 53 area in the version management information of each node, and the mark flag is cleared (to 0). set. Restore text by adding difference data
At the time of restoration, the complete text area 53 of the node to be restored has already been set, and if it is not a null pointer, it is skipped (yes in step 18). this is,
Already, the restored version is to prevent duplicate restoration. The above processing is repeated for one version node (version node 85 in this example) (steps 17 to 19-2).

The above process is repeated until all other versions to be restored (version nodes 87 in this embodiment) are restored (step 16).

When all of the marked restoration processes are completed, the plate processing unit 35 performs the remaining processes of the individual processes (registration, update retrieval, reference retrieval, and deletion). When all the processes have been completed, the difference file output unit 36 sets the pointer 53 to the complete text on each version node to a null pointer except for the base node when outputting the state of the version node on the memory to the difference file. I do.

[0027]

As described above, the plate restoring method of the present invention has the effect of improving the processing efficiency by preventing the same restoring process from overlapping when a plurality of plates are restored at once. is there.

[Brief description of the drawings]

FIG. 1 is a flowchart showing an embodiment of a plate restoring method according to the present invention.

FIG. 2 is a configuration diagram showing an embodiment of a version management system according to the present invention.

FIG. 3 is a diagram illustrating a configuration example of a difference file developed in a memory 37 according to the embodiment.

FIG. 4 is a diagram illustrating a configuration example of version management information in a version node according to the embodiment;

FIG. 5 is a diagram illustrating an example of management information of a branch node 46 according to the present embodiment.

FIG. 6 is an explanatory diagram for explaining a plurality of restoration processes according to the present invention.

FIG. 7 is a flowchart showing one embodiment of a conventional plate restoring method.

[Explanation of symbols]

 31, 33 version 32 Difference file 34 Difference management file reading unit 35 Version processing unit 36 Difference file output unit 37 Memory 40 Root pointer 41 to 45, 47 to 48 Version node 46 Branch node 51 Version ID (VID) 52 Mark flag 53 Complete Pointer to a simple text 54 Pointer to difference data 55 Pointer to a branch node 56 Pointer to a child node 57 Pointer to a parent node 61 Pointer to a child node 62 Pointer to a branch node 80 Base pointer 81 to 83, 85, 87 version node 84, 86 branch node 88 stack pointer 89 stack

Claims (2)

(57) [Claims] 1. A version control system for version control of texts such as programs, wherein only the first version is text-controlled, and the version after the first version is only the difference data between the version and the version before the version. Oite the plate restoring method in version management system for managing, restoration process when restoring the specified multiple versions, until the plurality of plate designated from the first edition
Only the version whose complete text has not been restored
Plate restoring method characterized by performing a process. 2. A version control system for version control of text such as a program, wherein only the first version is controlled for text, and the version after the first version is only difference data between the version and the version before the version. Oite the plate restoring method in version management system for managing, when restoring the specified multiple versions, searches for a route in to the plurality of plate designated from the first version, in the searched route plurality from said first version to a plurality of the plate which is the specified marking, then that is the specified from the first edition made of the mark
A restoring process that is performed only on a version whose complete text has not been restored up to the version of (a) , thereby improving the efficiency of the restoring process.