JPH103417A - File change history management system - Google Patents

Abstract

PROBLEM TO BE SOLVED: To provide a file change history management system giving an alarm to a person correcting a file later when plural persons independently correct the same place while the file is corrected. SOLUTION: The file change history management system is provided with a source code change history management device main body 201 and plural private editors 2021 , 2022 ,...202N correcting the file while communication is executed with the main body 201. The respective private editors 2021 , 2022 ,...202N transmit source codes whenever the file is corrected by one line and check whether other editors correct the same line of the same file. Thus, the same line of the same file is corrected, a message that correction is executed is transmitted to the pertinent private editors 2021 , 2022 ,...202N so as to display the alarm.

Description

DETAILED DESCRIPTION OF THE INVENTION

[0001]

[0001] 1. Field of the Invention [0002] The present invention relates to a file change history management system for managing a change history of a file including a source code and the like.

[0002]

2. Description of the Related Art For example, a source code change history management system has conventionally been used to manage a history of source code changes. In the system proposed in Japanese Patent Application Laid-Open No. 6-95912, a corrected source file is updated according to a user's instruction.

FIG. 11 shows an outline of the configuration of the proposed source code change history management system. This system simulates a test execution program starting means 112 for starting a test execution program 111 and a command of correction source information of a correction source file 113 to display correction source information, a simulated line and a simulation result. Source simulation means 114
And source program display means 1 for displaying source program information, execution lines and data values of source file 115
16, a correction source storage means 118 for storing the correction source file inputted from the terminal 117, and a source program updating means 119 for updating the source program information of the source file 115 from the correction source information. And when modifying various programs,
The program is created by simulating the correction and the instruction of the correction part at the same time as the test execution.

[0004]

However, in such a conventional source code change history management system, when a plurality of persons take out and correct the same file in order to correct the same file, the same file is used. We couldn't tell each other that we were modifying the rows. Therefore, there is a possibility that the same line is modified with different contents. In such a case, when the file that has been modified is replaced with the file before modification, situations such as further modification or deletion without knowing the modification contents of others may occur, or the contents of your modification However, there is a problem that even if you think that the content has been changed, it may actually be replaced with the content modified by another person.

To correct the same file, there has been a case where a method is adopted in which only the person who has registered first is permitted to register. In such a case, a person who intends to register the same line of the same file later needs to re-register after correcting the registered contents. Therefore, even if a plurality of persons try to modify the same file in a short time, this is practically difficult, and this has been a major obstacle to speeding up the modification of the file.

Accordingly, an object of the present invention is to provide a file change history management system capable of determining whether or not another person has modified the same line of the same file before finally changing the contents of the file itself. It is in.

Another object of the present invention is to provide a file change history which can warn a person who has made corrections later when a plurality of persons make corrections independently of the same portion while modifying the file. To provide a management system.

It is still another object of the present invention to provide a file change history management system in which a plurality of persons can independently modify a file in parallel.

[0009]

According to the first aspect of the present invention, there are provided (a) a file storing means for storing a file to be corrected, and (b) a file for extracting a file stored in the file storing means for correction. Removal means and (c)
A plurality of dedicated editors for individually modifying the files extracted by the file extracting means,
(D) The file change history management system is provided with a file updating means for updating the contents of the file retrieved from the file storage means with the corrected contents when the correction of the dedicated editor is completed.

That is, according to the first aspect of the present invention, the files extracted by the file extracting means at the same time or at slightly different times are individually modified by a plurality of dedicated editors, and the modified files are updated by the file updating means. , So that multiple persons can modify the same or different files in parallel.

According to the second aspect of the present invention, (a) a file storing means for storing a file to be corrected, (b) a file extracting means for extracting a file stored in the file storing means for correction, A) a plurality of dedicated editors for individually correcting the files extracted by the file extracting means; and (d) each time the data of a predetermined unit of the file is corrected, the corrected contents together with the position information corrected by these units. Management information storage means received from the dedicated editor and commonly stored as management information;
(E) a management information retrieval means for retrieving whether a plurality of pieces of the same position information data are stored in the management information storage means, and (f) a plurality of pieces of the same position information data stored by the management information search means. When it is determined that the data has been read, the duplicate correction data notifying means for notifying this to other than the first one of the dedicated editors that transmitted the data among the dedicated editors, and (g) the correction of the dedicated editor has been completed. At this time, the file change history management system is provided with a file update means for updating the contents of the file extracted from the file storage means with the corrected contents.

That is, according to the present invention, each time a predetermined unit of data is corrected in a state where the file is corrected by the respective dedicated editor, the corrected contents together with the corrected position information are managed by the dedicated editor. The management information retrieval means is made to transmit the data in common to the storage means and to determine whether a plurality of pieces of data of the same position information are stored. Then, when a plurality of pieces of data of the same position information are stored, the data is transmitted to a dedicated editor other than the one transmitted first, and the correction contents are examined before the correction is completed and the file is updated. I can do it.

According to a third aspect of the present invention, the data searched by the management information search means in the file change history management system according to the second aspect is data of the same version of the same file. If different files or the same file have different versions,
This is because there is no need to unify the contents of the file among a plurality of persons.

According to a fourth aspect of the present invention, in the file change history management system according to the second aspect, the predetermined unit of data is one line of source code data. That is, when the source code is changed, the check is performed on a line-by-line basis. Naturally, the file may be checked in units other than lines.

According to a fifth aspect of the present invention, in the file change history management system according to the fourth aspect, when the management information search means corrects data inserted between lines, the management information retrieving means updates the same position information. It is characterized in that it is not searched for as data. In a narrow sense, it can be seen that the content of the line itself has not changed.

[0016]

BEST MODE FOR CARRYING OUT THE INVENTION

[0017]

DESCRIPTION OF THE PREFERRED EMBODIMENTS The present invention will be described in detail below with reference to embodiments.

FIG. 1 shows a file according to an embodiment of the present invention.
Source code changes as an example of a change history management system
It shows the basic configuration of the history management system.
You. This system is a source code change history management device
Modify the file while communicating with the body 201
Multiple dedicated editors 202₁, 202_Two, ... 202_N
It is composed of Each dedicated editor 20
2₁, 202_Two, ... 202 _NModifies the file by one line
Source code change history management device body 201
Send data to source code and manage source code change history
Modification of the same line of the same file by another person in the device body 201
To check if you are doing
You. As a result of this check, correct the same line in the same file
When the source code change history management
The main body 201 is a dedicated editor 202₁, 202_Two, ……
202_NTo the applicable one of the
A message is sent and displayed.

FIG. 2 shows the outline of the configuration of the source code change history management device main body. The source code change history management device main body 201 has a CPU (central processing unit) 211 which is a center of various controls of the device. The CPU 211 is connected to each unit in the apparatus via a bus 212 such as a data bus. The control program storage medium 213 is a storage medium that stores a program for controlling the apparatus main body. This storage medium may be an external storage device such as a magnetic disk or the like, or may simply be composed of a ROM (Read Only Memory) depending on the scale of the system. Working memory 2
Reference numeral 14 denotes a memory for storing various data that is temporarily stored when the control program stored in the control program storage medium 213 is executed, and usually a RAM (random access memory) is used.

An input circuit 215 is a circuit for performing a general operation of the main body 201 of the source code change history management device, and includes a keyboard 216 as an input device.
Is connected, and a mouse 217 as a pointing device is connected to the keyboard 216.
Note that some devices do not require connection of one or both of the keyboard 216 and the mouse 217. For example, each dedicated editor 202 ₁ , 20 shown in FIG.
2 _2, when it is it which ...... 202 _N are replaced these functions. The display control circuit 218 is a circuit for displaying necessary visual information on the CRT 219. When the display units (not shown) of the dedicated editors 202 ₁ , 202 ₂ ,..., 202 _N have the same functions, the display control circuit 218 and the CRT 219 can be omitted as a system. The communication control circuit 221 is configured as shown in FIG.
Each dedicated editor 202 _1, 202 ₂ shown in, ... 20
This is a circuit for performing communication with _2N .

The source code change history management device main body 2
01, a plurality of changes indicating the state of the correction.
Source file 223 with update history₁, 223_Two…… 2
23 _MAnd the management file 224 are also connected. this
Are outside the magnetic disk drive or optical disk drive.
May be stored in the external storage device or the working memory 2
These storage areas are allocated on the same RAM as
It may be.

FIG. 3 shows the structure of a source file with a change history. The source file with change history 223 has a number 231 at the left end of the file, and displays the source image 232 from a fixed column. Each source line must have a unique number.

FIG. 4 shows the structure of the management file. The management file 224 has a file name 241,
It has items of a file version number (version) 242, a name (login name) 243, a correction position number 244, and a section 245. Here, division means file change,
This means deletion and addition, where R is assigned for change, D for deletion, and A for addition. The management file 224 stores the dedicated editor 20 shown in FIG.
2 _1, 202 _2, being adapted to capture data transmitted from ...... 202 _N, the transmitted data is adapted to perform the check whether the conflict. Each dedicated editor 202 ₁ , 202 ₂ ,... 202 _N
Is completed, the file name 241 and its version number 242 are the same, and the name 243 does not exist other than the user, the information (data) of all the specified file names 241
Is to be deleted.

FIG. 5 shows the first half of the outline of the processing of the source code change history management system.
This processing will be described with reference to FIGS. First, a file to be corrected is extracted from source files managed by the system in accordance with an instruction from the operator (step S101). The following dedicated editor 2
02 is started (step S102), and a state in which correction of the extracted file can be started (step S10).
3). In this state, the CPU 211 monitors the time point when the correction for one line is completed (step S104). When the correction is completed (Y), the file name 241, the file version number 242, and the name (login name) 243 are stored in the management file 224. , The correction position number 244 and the section 245 are transmitted.

The CPU 211 checks based on the management file 224 whether or not there is a person who has corrected the same line of the same version in the same file (step S1).
06). If it is determined that there is another person in the management file 224 (Y), the dedicated editor 202 of the person who sent the data is told that the name of the person who made the correction is "duplicately corrected". The message is transmitted (step S107).

FIG. 6 shows the latter half of the process shown in FIG. The CPU 211 determines whether the correction has been completed in this state (step S108),
If not completed (N), the process proceeds to the next correction line (step S109), and waits for completion of the line correction (step S104). Thereafter, the same processing is repeated until the correction is completed (steps S104 to S10).
9).

When the series of lines have been corrected (step S
108; Y), the process of the dedicated editor 202 is terminated (step S110), and the file is updated in the source code change history management device main body 201 in a manner incorporating the correction contents (step S111). After the file is updated, a check is made using the management file 224 to determine whether another person has taken out the same version of the same file (step S112). If not taken out by another person (Y), all the lines displaying the same file in the same version are deleted (step 113), and the process is terminated (END).

FIG. 7 is a diagram for explaining a situation where the same file is modified by a plurality of persons and the same line is not modified. As shown in FIG.
The third change history with source files 223 ₁ to 223 ₃
A. c, b. c, c. c.

FIG. 3B shows an example of the contents of the management file when two persons start their respective dedicated editors. In this example, Mr. T and Mr. S start the first version of the source file with change history 223 ₁ with the same version number (version number “1.1”) using the dedicated editors 202 ₁ and 202 ₂ . . In this state, no rows have been modified.

FIG. 9C shows a situation where Mr. T has made a change (R) to change the fifth line of this file in this state. FIG. 3D shows a situation in which Mr. S has modified (R) the third line of the same file thereafter. Upon completion of these corrections, data is transmitted from the corresponding dedicated editor 202 to the management file 224 and is reflected. However, FIG.
As shown in (1), although the same file has been modified for the same version, since there are modifications to different lines, there is no conflict between the two. Therefore, in the example shown in FIG. 7, step S107 in FIG.
Will not be output.

FIG. 8 is a view for explaining a situation in which the same file is corrected when a plurality of persons correct the same file. FIG. 7A shows the structure of a source code management file, which is the same as FIG. 7A. 7B and FIG. 7C are the same as those in FIG. After the state of FIG.
Deletes the fifth line of the file modified by T (D)
Suppose you have made a correction. When this line has been modified,
The data is sent from the special editor 202 _S to the management file 224. As a result, the status of the management file 224 is as shown in FIG.

[0032] CPU211 searches the management file 224, for the "fifth line", this is because it is the same version of the same file, you have "T's on a dedicated editor 202 _S of S's is to modify the fifth line. The CPU 211 repeats the checking operation every time the corrector makes a correction line by line. As a result, before finally returning the corrected file to the source code change history management device main body 201, Mr. S can confirm to Mr. T the contents of the correction in the "fifth line".

FIG. 9 illustrates a case where the same file is modified by a plurality of persons, and the same line is modified and the designated line is changed. As shown in FIG. 3B, Mr. T extracts the source file (ac) 223 ₁ to modify the file, and Mr. S also extracts it to modify this file, and the respective dedicated editor 202 _S , and to start the 202 _T, management file 22
4 has the contents as shown in FIG. Two people take out the same file of the same version and use the special editor 2
It is assumed that correction is started at 02 _S and 202 _T. T's is the first to change the line 10, the data in the management file 224 from a dedicated editor 202 _T and its first line of the correction is completed is sent. FIG. 9C shows the state of the management file 224 at the time of this transmission.

Next, Mr. S receives this source file (a.
c) 223₁If you change line 10 of
Dedicated editor 202 upon completion_SSent data from
The contents are written to the management file 224. Same figure
(D) shows this state. CPU 211 has two people
Modify the same version of the same file and the modification position
It is checked whether the numbers are the same (step S in FIG. 5).
105). In this case, they are the same,
(Y), Mr. S's dedicated editor 20 that was modified later
2 _SAbove, "T is correcting line" 10 "."
Is sent. In the same way
Each time T or S corrects one line, CPU2
11 is a person who performs a check and corrects the same line later
If there is, send a message to that person
Will be. As a result, those who later modified the same line
Finally changes the modified file to source code
Before returning to the update history management device main unit 201, the same line
Can confirm the details of the modification
You.

Modification

The source code change history management system of this modification can cope with a case where the same file is modified by a plurality of persons. When a plurality of persons modify the same file, and these persons do not modify the same line, the same processing as that of FIG. 7 of the above-described embodiment is performed. Therefore, the description in this case is omitted. Also,
The source code change history management system of this modification is shown in FIG.
Since the configuration is substantially the same as that shown in FIG.

FIG. 10 shows a case where the same file is modified by a plurality of persons in this modified example, and shows a change in the content of the management file when a line is added. As shown in FIG. 7A, the system is provided with first to third change history-added source files 223 _{1 to} 223 ₃ and a management file 224.

As shown in FIG. 3B, in order for Mr. T to correct the file, the source file (ac) 223 ₁
, And Mr. S also fetches this file to modify it, and uses the respective dedicated editors 202 _S , 202 _T
Is activated, the management file 224 has contents as shown in FIG. It is assumed that two persons take out the same file of the same version and start the correction using the dedicated editors 202 _S and 202 _T. Mr. T changes the 10th line first, and when the correction of the 1st line is completed, the special editor 202
Data is transmitted from _T to the management file 224. FIG. 9C shows the state of the management file 224 at the time of this transmission.

Next, S is the source file (ac) 2
Add a line between the 23 _first lines 10 and 11, and transmits the data to the management file 224 from the special editor 202 _S as one line modification has been completed. FIG. 9D shows the state of the management file 224 after the transmission. The CPU 211 shown in FIG. 2 checks whether two persons have corrected the same version of the same file and whether the correction numbers are the same. In this case, since the contents of the tenth line itself have not been changed, they are not determined to be the same. Therefore, the CPU 211 does not transmit a message to Mr. S who has made a correction later. The same is true for Mr. T. The CPU 211 repeats the checking operation for the correction for each line in the same manner.

The processing in the source code change history management system of this modified example includes the determination of “one line correction” in step S104 of the flowchart shown in FIG. 5 up to the addition of a line, and the same version of the same file in step S106. By interpreting literally whether or not the same line has been corrected, the same procedure can be performed.

[0041]

As described above, according to the first aspect of the present invention, when a file consisting of a source code or the like is changed, the files extracted by the file extracting means at the same time or with a slightly different time are used. Since it is possible to make corrections independently with a plurality of dedicated editors, the change work can be efficiently performed by a plurality of persons.

According to the second aspect of the present invention, each time a predetermined unit of data is corrected in a state where the file is corrected by the respective dedicated editor, the contents of the correction together with the corrected position information are written to these dedicated editors. To the management information storage means so that the management information search means can determine whether a plurality of pieces of data of the same position information are stored. Can confirm what kind of correction work is being performed. When the same part is modified, a warning can be issued to the person before the file is finally replaced, so that the same part can be modified with agreement. Become.

[Brief description of the drawings]

FIG. 1 is a system configuration diagram showing a basic configuration of a source code change history management system according to an embodiment of the present invention.

FIG. 2 is a block diagram showing an outline of a configuration of a source code change history management device main body.

FIG. 3 is an explanatory diagram showing a configuration of a source file with a change history according to the embodiment.

FIG. 4 is an explanatory diagram showing a configuration of a management file according to the embodiment.

FIG. 5 is a flowchart showing the first half of the outline of the processing of the source code change history management system.

FIG. 6 is a flowchart showing a latter half of the process shown in FIG. 5;

FIG. 7 is an explanatory diagram showing a relationship between a source file and a management file and a state of a management file when a plurality of persons correct different lines of the same file.

FIG. 8 is an explanatory diagram showing a relationship between a source file and a management file and a situation of the management file when a plurality of persons modify the same line of the same file.

FIG. 9 shows a case where a plurality of persons modify the same file.
FIG. 11 is an explanatory diagram illustrating a case where the same line is corrected and a designated line is changed.

FIG. 10 is an explanatory diagram showing a change in the content of a management file when a line is added when the same file is modified by a plurality of persons in a modification of the present invention.

FIG. 11 is a block diagram showing an outline of a configuration of a conventional source code change history management system.

[Explanation of symbols]

 201 Source code change history management device main body 202 Dedicated editor 211 CPU 213 Control program storage medium 214 Working memory 221 Communication control circuit 223 Source file 224 Management file 241 File name 242 File version 244 Correction position number

Claims (5)

[Claims] A file storage unit for storing a file to be corrected; a file extraction unit for extracting a file stored in the file storage unit for modification; and a file extracted by the file extraction unit for exclusive use. A plurality of dedicated editors, and file updating means for updating the contents of the file retrieved from the file storage means with the corrected contents when the correction of these dedicated editors is completed. File change history management system. 2. A file storing means for storing a file to be corrected, a file extracting means for extracting the file stored in the file storing means for correction, and a file exclusively extracted by the file extracting means, respectively. And a management information storage means for receiving, from each of these dedicated editors, the contents of the correction together with the corrected position information each time the data of a predetermined unit of the file is corrected, and storing the same as management information in common. Management information search means for searching whether a plurality of pieces of the same position information data are stored in the management information storage means; and determining that the plurality of pieces of the same position information data are stored in the management information search means. When this is done, this is sent first among the dedicated editors that sent that data among the dedicated editors Duplication correction data notifying means for notifying other than the file, and file updating means for respectively updating the contents of the file extracted from the file storage means with the corrected contents when the correction of the dedicated editor is completed. A file change history management system, characterized in that: 3. The file change history management system according to claim 2, wherein the data searched by said management information search means is data of the same version of the same file. 4. The file change history management system according to claim 2, wherein said predetermined unit of data is data for one line of a source code. 5. The file change method according to claim 4, wherein the management information search means does not search for correction of inserting data between lines as data of the same position information. History management system.