JPH0744432A - Version management system - Google Patents

Abstract

PURPOSE:To conduct management of a difference efficiently in specification data comprising composite data of plural different types under a CASE environment. CONSTITUTION:A repository 1 manages and stores plural versions of specification data being composite data of plural different types and a compression depression means 2 compresses and depression specification data when the specification data are stored from a work space 6 to a repository 1 or the specification data are read from the repository 1 conversely to the work space 6. A configuration difference management means 3 manages a difference between versions when the specification data are stored in the repository 1 or extracted from the repository 1 conversely for each type of the specification data and a text difference management means 4 manages the difference of text data having a simple data structure. A document means 5 displays the difference between versions with emphasis in an expression form specific to a document in the output of the document of the specification data.

Description

Detailed Description of the Invention

[0001]

BACKGROUND OF THE INVENTION 1. Field of the Invention The present invention relates to a plate management system,
Especially CASE (Computer Aided Sof)
The present invention relates to a version management system that manages a plurality of versions of specification data from which a program is derived in a software development support environment (hereinafter simply referred to as a CASE environment) based on "Two Ware Engineering".

[0002]

2. Description of the Related Art In recent years, in the CASE environment, not only data having a single data structure such as source text, but also composite data of a plurality of different types (Compos
It is designed to provide a highly abstracted development support environment with specification data consisting of (it). Therefore,
Even in a version management system that manages multiple versions of specification data from which a program is derived in such a CASE environment, in addition to the conventional text data having a single data structure, it is possible to combine multiple types of data. There is a need for an effective method of managing multiple versions for the following specification data.

In the conventional version management system, the specification data is managed as text data having a single data structure like the source text of the program. For example, as shown in FIG. 8A, when creating a difference between the first and second editions of the program X, it is treated as text data when a plurality of different types of data are mixed, I tried to minimize the difference between the editions by using Suki's algorithm. As a result, the data 22 and 26 and the data 24 and 27 are made the same and the difference is created so as to be the maximum among the differences (see, for example, JP-A-2-79121). .

However, in the CASE environment, the specification data is composed of a plurality of different types of data. Therefore, if a difference is created as a single text data by the above-mentioned method, the same data is obtained between different types of data. If there are data values, they are treated the same and the difference is taken. In other words, since the specification data includes a description, a program procedure description, management keywords, diagrams, etc., even if the data values are the same, the program procedure description and the description content are the same. It cannot be treated as a thing.

For example, as shown in FIG. 8B, when the specification data is composed of a combination of type 1 and type 2 data, when the difference is created to manage the change between the versions, the data 211 It should be clear that the and data 214 should not be compared to be identical. That is, when creating a difference of specification data consisting of a composite of multiple different types of data, it is necessary to create a difference in that data structure and then create a difference within the same type. Since the technique handles it as text data, it was not possible to create a difference in such a case.

Further, in the conventional version management system, when displaying the difference, the difference between the first and second versions of the specification data indicates the changed position and the changed content, that is, addition / change / deletion. Was there. Therefore, it was difficult to capture the changes in the whole when they are effectively used in the review work.

[0007]

In the above-mentioned conventional version management system, since the specification data composed of a composite of a plurality of different types of data is managed as text data, it is possible to create a difference between different types of data. Even comparisons that do not need to be compared are performed, and creating a meaningless difference causes problems such as poor accuracy of the difference and extra processing time.

Further, even when the difference is displayed, only the changed portion is displayed, so that it is difficult to understand the content when the difference is used in a review work, and the difference cannot be sufficiently utilized. there were.

In view of the above points, an object of the present invention is CAS.
An object of the present invention is to provide a version management system capable of effectively managing differences in specification data composed of a plurality of different types of data in an E environment.

Further, another object of the present invention is to highlight differences in a document so that the comprehension is improved when the differences between editions are used for reviews and the like, and the differences can be utilized. The purpose is to provide a version control system.

[0011]

A version management system of the present invention is a version management system for managing a plurality of versions of specification data from which a program forming an information system is derived, and is a composite of a plurality of different types of data. And a repository that manages and stores multiple versions of the specification data, and compresses the specification data when storing the specification data from the workspace to the repository and conversely retrieves the specification data from the repository to the workspace. A compression / decompression means for decompressing the specification data compressed in the above, and a difference between versions when the specification data is stored in the repository or conversely retrieved from the repository are managed for each type of data held in the specification data. Configuration difference management means that manages the difference between text data with a single data structure. And a strike difference management means.

Further, the version management system of the present invention is a version management system for managing a plurality of versions of specification data from which a program forming an information system is derived, and specification data which is a composite of a plurality of different types of data. And a repository that manages and stores multiple versions of the specification data. When the specification data is stored from the workspace to the repository, the specification data is compressed. Conversely, when the specification data is extracted from the repository to the workspace, it is compressed. A compression / decompression means for decompressing the specification data, and a configuration difference management for managing the difference between versions when storing the specification data in the repository or conversely extracting it from the repository for each type of data held in the specification data. Means and text management that manages differences in text data with a single data structure A stage and, a document means to highlight differences between the plate into the document-specific form of representation at the output of the specification data document.

[0013]

The present invention will be described in detail with reference to the drawings.

FIG. 1 is a block diagram showing the configuration of a version management system according to an embodiment of the present invention. The version management system of this embodiment comprises a repository 1, a compression / decompression means 2, a configuration difference management means 3, a text difference management means 4, a document means 5 and a workspace 6 as its main components. ing.

FIG. 2 is a diagram illustrating the relationship between the first and second versions of the specification data and the difference.

FIG. 3 is a diagram showing a display example of a document.

FIG. 4 is a diagram showing the structure of X specification data. In FIG. 4, X specification data represents specification data of the decompression result of the repository 1 when X is “O”,
“N” represents the specification data of the workspace 6. “Δ”
Represents the specification data of the new version to be created.

FIG. 5 is a flow chart showing the first half of the processing of the configuration difference management means 3 in more detail.

FIG. 6 is a flow chart showing the latter half of the processing of the configuration difference management means 3 in more detail.

FIG. 7 is a flowchart showing the connection processing (connect processing) with the upper node of the Δ specification data in more detail.

Next, the operation of the version management system of the present embodiment thus constructed will be described.

(1) Example of difference management of specification data

First, the compression / decompression means 2 is the repository 1
Decompress the compressed specification data stored in and restore the original specification data. For example, in FIG. 2, the program P
The first edition of is an example of this. The root node P. 1 is a node Y. 1 and the internal configuration Y is composed of nodes Y0, Y1 and Y2. Furthermore, links are provided from the nodes Y0, Y1 and Y2 to the substance contents (Y0), (Y1) and (Y2).

Next, the configuration difference management means 3 creates a difference consisting of a changed portion of the configuration information between the specification data on the workspace 6 and the specification data decompressed from the repository 1. This is done in the following order.

Assuming that the specification data of the second version of the program P exists as in the workspace 6, the root node P. 1 is copied, and the root node P. 2, which is renamed as the root node P.2 of the second version of program P. Create 2. Root node P. Node Y immediately below 1. The link pointing to 1 is also copied. That is, the root node P. 2 from the node Y. The link to 1 is retained. Conversely, the node Y. 1 is the root node P. 1 and the root node P.1. There is a link to the upper two. Unless otherwise noted, links have forward / reverse directions.

The root node P. The difference of the configuration information under 2 is to first create a set of nodes subordinate to the repository 1 and a set of nodes subordinate to the workspace 6 of the program P, and process the common node set of the repository 1 and the workspace 6. Realized by processing the node set that exists only in repository 1 and does not exist in workspace 6 and the node set that does not exist in repository 1 but exists in workspace 6 from the upper node of the hierarchy to the lower node. To do.

(A) The following conditions are evaluated, and if any of them is satisfied, a new version node is created in the Δspecification data and held under the corresponding (previous version) node of the repository 1. Copy the link set under the newly created version of the Δ node. Also, connection is made with the node of the Δ specification data that is higher than the newly created Δ specification data. However,
Regarding the top level, the subordinate links are always copied, and since there is no upper node, the copy process and the connection with the upper node are bypassed.

Condition 1: It is evaluated whether or not there is substantive content in either the repository 1 or the workspace 6 or both, and if there is substantive content, the text management means 4 causes the repository 1 and the workspace 6 to be exchanged. When a difference is created and there is a difference in substance content

Condition 2: When the dependent node set exists only in repository 1 and is not empty

Condition 3: When the subordinate node set which exists only in the workspace 6 in the subordinate node set is not empty

(B) The processing of a common node set subordinate to a node will be described. The common node set dependent on the program P is {Y}, and the number of elements in the common node set is one. The presence or absence of the substance content of the node Y is checked. In the present case, the actual content is repository 1
Since it does not exist on the side of or in the side of the workspace 6, the difference of the substance content is not created. Next, the presence / absence of a node under the internal configuration Y is checked, and if there is a subordinate node, the subordinate node is processed. That is, the process recursively recursively deepens the hierarchy until there are no subordinate nodes.

(C) For the processing of a node set existing only in the repository 1 and not in the workspace 6,
In the link copied under the node of Δ specification data,
Delete the link with the node that points to the relevant node.

(D) Regarding the processing of the node set existing only in the workspace 6, the corresponding node set is a newly added node, and the corresponding node in the workspace 6 and the node set under the same are set in the Δ specification data. Copy it under.

The flow of the above processing will be described below by taking the program specification P as an example. Since the node P is at the top level, the nodes under the node P are the root node P. Since the link set held under 1 is copied, (a) is bypassed. In the node set forming the node P, a common set {Y} with the repository 1, a node set {} that exists only in the repository 1,
This is performed for the set {Z} existing only in the workspace 6.

First, for a common set, the processing for the members forming the common set is recursively repeated. That is, the common set {Y1,
Y2}, node set existing only in repository 1 {Y
0}, a node set {} existing only on the workspace 6 side (there is no corresponding node) is created.

(A) is evaluated. As a result, since the condition is satisfied (the node set existing only in the repository 1 is not empty), the node Y. 2 is newly created, and the node Y. The links held under 1 are copied. In addition, the node Y. 2 and the node P.
2 is connected.

Further, the node Y1 is again processed. As a result, a subordinate node set constituting the node Y1 is created, but the common node set, the node set existing only in the repository 1, and the node set existing only in the workspace 6 are all empty sets. Since Y1 has substance contents and there is a difference in substance contents, the condition (a) is satisfied. Therefore, the node Y1.2 is created, and the difference in the substance content is the node Y1.
Held at 2.

The node Y.1, which is a node higher than the node Y1.2, is also used. And connection with 2. Since there is no set under the node Y1, the nesting of the common node set does not go deeper and returns to the previous stage. That is, node Y2
Move to processing.

Node Y2 which is a member of the common node set
The same process is performed for the node Y2, but since there is no subordinate set for the node Y2 and the substance content of the node Y2 has no difference, the process is bypassed. The process returns to the previous level. That is, the root node P.
Processing of a set {Z} that exists only in the workspace 6 in the node set under 1 is performed. That is, the nodes, links and substance contents under the node Z in the workspace 6 are on the Δ specification data side, that is, the root node P. It is copied under 2. After that, it tries to go back one step further, but since it is already at the top level, the processing ends.

In the following, N specification data (workspace 6) is used for O specification data (decompression result of repository 1).
The operation of the configuration difference management unit 3 will be described in detail with respect to an example of creating the.

Step 61: Processing is performed in order from the top level of the N specification data and the O specification data, that is, from the top of the hierarchy. The variable i represents the depth of the level. Level 0 is the top level, and 1 is added each time the level gets deeper. A root node Δ_N (i) of Δspecification data is created. For the top level, the root node O_
Link set O_LinkSe held under N (i)
Copy t (i) as a link set Δ_LinkSet (i) under the root node Δ_N (i). And O
If the specification data or N specification data has substance contents, the root node O_N (i) of the O specification data
And a difference in substance content between the root node N_N (i) of the N specification data is created by the text management means 4 and held as the substance content of the root node Δ_N (i).

Step 62: Node O of O specification data
Node set O_N of O specification data dependent on _N (i)
odeSet (i + 1) is created and the node set P
_O. Similarly, the node N_N of N specification data
Node set N_Nod of N specification data subordinate to (i)
eSet (i + 1) is created, and this is set to the node set P_N
And

Step 63: The common set of the node set P_O and the node set P_N created above is a common node set P, a node set D existing in the node set P_O but not in the node set P_N, and a node existing in the node set P_N. A node set A that does not exist in the set P_O is created by logical product and logical difference using the node name as a key.

Step 64: It is judged whether any of the following conditions are satisfied.

Condition 1: When either the node O_N (i) or the node N_N (i) or both have substance contents, the substance contents are compared by the text management means 4 and a difference exists.

Condition 2: When the node set D is not empty

Condition 3: When node set A is not empty

Step 65: If the above is satisfied, a node Δ_N (i) is newly created, and a node O_N is created.
The text management means 4 creates a difference in substance content between (i) and the node N_N (i), and the difference is created in the node Δ_N (i).
Of the node O_N
Link set O_LinkSet held under (i)
(I) is copied under the link set Δ_LinkSet (i). Furthermore, the newly created node Δ_N (i)
Connect to the upper node of Δ specification data
Processing 650 is performed (however, if the level i is 0, that is, the top level, this processing is bypassed). If the condition of step 65 is not satisfied, it is evaluated whether or not there is a common node set under its control, and if it exists, the process of step 66 is performed to perform the processing of the subordinate nodes.

Step 66: It is judged whether or not the common node set P is empty. If it is empty, step 71 is executed, and if it is not empty, step 67 is executed.

Step 67: The next element of the common node set P is taken out.

Step 68: If there is no element to be extracted from the common node set P as a result of step 67, the level is set to 1
Step 71 is executed to return. If the element can be fetched, step 69 is executed.

Step 69: The common node set P of level i is stacked and held (used in the subsequent processing), and one level i is added.

Step 70: In order to perform the process on the element extracted from the common node set P, the common-set process surrounded by the solid line is recursively called.

Step 71: It is evaluated whether or not the level i is 0. If the level i is 0, it means that it is the top level and the process is terminated. If the level i is not 0, the step 72 for returning the level is executed.

Step 72: Subtract one from level i.
That is, it returns to the previous step.

Step 73: Evaluate whether there is a common node set P of level i. If there is no common node set P of level i, execute step 71,
The level is returned, and it is evaluated whether or not there is a common node set P at a higher level. If so, step 67 is executed to read the next element of the level i common node set P held in the stack.

Step 650: When a new Δspecification node is created, a process for connecting to a higher level Δspecification node is executed.

Step 651: Initialize (clear to zero) the variable q. The variable q is a variable that manages an upper level node to be connected.

Step 652: Node O_N (i-
Evaluate whether there is a node Δ_N (i-1-q) pointing to q). If the variable q is 0, the node O_N
The node at the level immediately above (i) is node O_N (i-
1) and whether it is pointed to by both the node Δ_N (i-1). This is true
Only when this process is called when i is 1 and the Δ specification node is created (when i is 1, since the top level is the root node, the node O_N is first placed under the Δ specification data. (Copying the link to (1)).
Otherwise, there is always such a node at some higher level, even if it is not found immediately above level i (because it exists at least under the root node, and the book This is because the constitutive model is a tree model and one root node is always reached by following the upper link).

Step 653: If there is no higher level node as a result of step 652, a higher level node Δ_N (i-1-q) is created.

Step 654: Node O_N (i-
The upper node that points to q) is the node [x] O_N (i-1-
q), if the node [x] O_N (i-1-q) has the entity content, the entity content of the node Δ_N (i-1-q) is created without any difference. This is a process of setting the substance content of the created Δ specification data. If there is a substance content, it means that there is no difference, but since there is a substance content, the substance content with a difference of zero is created. If there is no substance content, there is no substance content.

Step 655: Node [x] O_N
The link set of (i-1-q) is a node Δ_N (i-1--
q), and within that link the node O_N (i
-Q) delete the link pointing to node Δ_N (i-q)
Change to point to. That is, with this, the node Δ_N
(Iq) is connected to the upper level Δspecification node.

Step 656: The variable q is incremented by 1, and the process of connecting to the node at the higher level is performed.

Step 657: Node O_N (i-
If there is a node Δ_N (i-1-q) that points to q), then a node O that the node Δ_N (i-1-q) points to
The link to _N (i-q) is deleted, and the node Δ_N
Change to a link pointing to (iq).

(2) Example of highlighting difference

In FIG. 3, 32 and 33 are examples in which the first and second versions of the program P in the repository 1 are restored by the compression / decompression means 2 and displayed by the document means 5. Reference numeral 31 is an example in which the difference between the first edition and the second edition is highlighted, and this example will be described.

There are various types of document display, but here, for simplification, an example in which the contents of the node are obtained and displayed, that is, the most detailed document is displayed will be described. The document means 5 uses the configuration difference management means 3 to recognize the configuration difference to be displayed as a difference, and displays the configuration difference on the document based on its hierarchical structure. That is, in 31, the composite data set Y0 is deleted, Y1 is updated, Y2 is the same, Z
Is displayed as an addition, the difference display is performed in units of the configuration. In this case, as shown in 31, regarding deletion, it can be seen that the entire group of the configuration Y0 has been deleted.
Display it at the position displayed in the first edition and mark it as deleted. Addition is almost the same as deletion, and a mark is added so that it can be seen that a group of components has been added.
Regarding updating, the text difference management means 4 displays the text data, that is, the difference at the level. In this case, either the first edition or the second edition is selected as the content to be displayed. In the case of the example in FIG. 3, the second version is selected, that is, the difference from the first version is marked on the content of the latest document. “#” Is an example displayed so that it can be seen that the update and “?” Have been added.

[0068]

As described above, according to the present invention, the CASE
According to the environment, specification data consisting of multiple different types of data can be held by the root of the version or by the difference from the base version that represents an arbitrary version, without having to copy the entire specification data for each version. effective. Also, since the difference is managed by the configuration for each data type,
There is an effect that it is possible to accurately grasp the changed part and perform version management with improved space efficiency without making a difference by comparing data of different types.

Further, since the difference can be highlighted in the document, there is an effect that the intelligibility is improved when the change between versions is used in software review and the like, and the use of the difference is improved.

[Brief description of drawings]

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

FIG. 2 is a diagram exemplifying difference management of specification data in the version management system of the present embodiment.

FIG. 3 is a diagram exemplifying a difference document display in the version management system of the present embodiment.

FIG. 4 is a diagram illustrating a structure of specification data in the version management system of the present embodiment.

5 is a diagram illustrating the first half of the process of the configuration difference management unit in FIG.

FIG. 6 is a diagram for explaining the latter half of the processing by the configuration difference management means in FIG.

7 is a flowchart showing a connection process (connect process) with the upper node of the Δ specification data in FIG. 5.

8A and 8B are diagrams for explaining a conventional technique.

[Explanation of symbols]

 1 repository 2 compression / expansion means 3 configuration difference management means 4 text difference management means 5 document means 6 workspace

Claims (2)

[Claims] 1. A version management system for managing a plurality of versions of specification data from which a program constituting an information system is derived, and managing and storing a plurality of versions of specification data which are a composite of a plurality of different types of data. And the repository that compresses the specification data when storing the specification data from the workspace to the repository, and conversely decompresses the compressed specification data when extracting the specification data from the repository to the workspace. Means and a configuration difference management means for managing the difference between versions for each type of data held in the specification data when storing the specification data in the repository or conversely extracting it from the repository, and a single data structure And a text difference management means for managing the difference in the text data having Version management system to. 2. A version management system for managing a plurality of versions of specification data from which a program forming an information system is derived, and managing and storing a plurality of versions of specification data which is a composite of a plurality of different types of data. And the repository that compresses the specification data when storing the specification data from the workspace to the repository, and conversely decompresses the compressed specification data when extracting the specification data from the repository to the workspace. Means and a configuration difference management means for managing the difference between versions for each type of data held in the specification data when storing the specification data in the repository or conversely extracting it from the repository, and a single data structure With a text management method for managing differences in text data with Version management system; and a document means to highlight differences between the plate into the document-specific form of representation in bets output.