Summary of the invention
In view of this, the invention provides method, the Apparatus and system of Version Control, can't learn that to solve the prior art user which belongs to same task in the version resource that changes.
A kind of method of Version Control, described method comprises:
According to the modification task version resource is made amendment, record modification the contextual information of version resource, described contextual information is the version resource that is associated with the version resource of revising, and perhaps, helps to understand the version resource of the version resource of modification; And create the task items of described task;
With described contextual information, version resource and the described task items revised are uploaded to version control server.
Preferably, the task items of the described task of described establishment comprises:
Described modification task, version resource and the described contextual information revised are positioned in the file;
Described file is mapped as described task items.
A kind of method of Version Control, described method comprises:
The version resource of this locality preservation and the version resource in the version control server are compared;
If have the version resource in described version control server, to revise in the local version resource of preserving, then in described version control server, search the contextual information whether the version resource of having revised is arranged, if described contextual information is arranged, then described contextual information is opened, and from described version control server, obtained task items corresponding to the version resource of having revised according to described contextual information; Described contextual information is used for making the user to understand the version resource that described version control server has been made amendment;
The version source synchronous that described task items is comprised is in described local version resource of preserving.
A kind of Version Control client, described Version Control client comprises:
Revise the unit, be used for the version resource is made amendment;
The task items creating unit is used for the modification that basis is carried out the version resource, the creation task item;
Record cell, be used for record modification the contextual information of version resource;
Uploading unit is used for the contextual information of described recording unit records, and the task items that the version resource revised and described task items creating unit are created is uploaded to version control server.
A kind of Version Control client, described Version Control client comprises:
The contrast unit is used for the version resource of this locality preservation and the version resource of version control server are compared;
Acquiring unit has the version resource to revise in described version control server if described contrast unit contrasts in the local version resource of preserving, and is used for obtaining task items corresponding to the version resource of having revised from described version control server;
The contextual information unit, be used for searching the contextual information whether the version resource of having revised is arranged at described version control server, if described contextual information is arranged, then described contextual information is opened, described contextual information is used for making the user to understand the version resource that described version control server has been made amendment;
Lock unit, the version source synchronous that is used for the task items that described acquiring unit obtains is comprised is in described local version resource of preserving.
A kind of version control server, described version control server comprises:
Receiving element has been used to receive from the modification of Version Control client version resource and task items;
Contextual information is preserved the unit, is used to preserve the contextual information from described Version Control client;
Preserve the unit, be used to preserve modification that described receiving element receives version resource and task items.
A kind of version control system, described system comprises:
The Version Control client, be used to make the user according to the task items of revising the described modification task of task creation, record modification the contextual information of version resource, described contextual information is the version resource that is associated with the version resource of revising, perhaps, help to understand the version resource of the version resource of modification; Communicate with version control server, with described contextual information, version resource and the described task items revised are uploaded to described version control server;
The version resource of this locality preservation and the version resource in the version control server are compared, if have the version resource in described version control server, to revise in the local version resource of preserving, then in described version control server, search the contextual information whether the version resource of having revised is arranged, if described contextual information is arranged, then described contextual information is opened, and from described version control server, obtaining task items corresponding to the version resource of having revised according to described contextual information, described contextual information is used for making the user to understand the version resource that described version control server has been made amendment; The version source synchronous that described task items is comprised is in described local version resource of preserving.
As can be seen, the user can learn which task items is the version resource that changes belong to according to task items when the synchronous version Control Server.Thereby, be convenient to the user version resource of having revised is carried out taxonomic revision, put main line in order, increase work efficiency.
In addition, because the user is when the upload version Control Server, the contextual information of the version resource revised together is uploaded to version control server, other user can be when consulting the version resource of having revised, consult the contextual information of the version resource of making amendment, be convenient to understand.
Embodiment
For above-mentioned feature of the present invention, advantage are become apparent more, the present invention is described in detail below in conjunction with embodiment.
Please refer to Fig. 1, be the method flow diagram of the present invention, may further comprise the steps to version control server upload version resource:
Step 101: according to the modification task version resource is made amendment, and the task items of creation task;
Step 102: version resource and the task items that will revise are uploaded to version control server.
Below step shown in Figure 1 is elaborated, please refer to Fig. 2, can may further comprise the steps:
Step 201: the version resource of Version Control customer end A and version control server carry out synchronously;
Step 202: user A makes amendment to the version resource that belongs to task X on the Version Control customer end A;
One skilled in the art will appreciate that the version resource that belongs to task X can have a plurality of.For convenience of description, be that example describes only with version resource 1, version resource 2, version resource 3.
Step 203: to the version resource (being version resource 1, version resource 2 and version resource 3) of task X revise finish after, write down the contextual information of version resource 1, version resource 2 and version resource 3 respectively;
Contextual information is meant the version resource that the modification of any and version resource 1, version resource 2 and version resource 3 is associated, perhaps, and by the version resource of modification intention user A appointment, that be used to help other user to understand user A.
Step 204: user A is at the task items X of Version Control customer end A creation task X;
The task items of task X represents that version resource 1, version resource 2 and version resource 3 all belong to task X.Can be " revising certain Bug ", perhaps, " strengthening certain function ".
The method of creation task item can comprise: with task X, version resource 1, version resource 2, the version resource 3 revised, and contextual information is positioned in the hiding file; The file of hiding is mapped as task items X.
The method that it is pointed out that the creation task item is not limited to this, and for example, interface that can also the revision Control Server is realized.
Step 205: user A uploads amended version resource 1, version resource 2 and version resource 3 in the Version Control customer end A to version control server, the contextual information of version resource 1, version resource 2 and version resource 3 and the task items of task X.
So far, user A finishes in the flow process of Version Control customer end A to version control server upload version resource.Utilize step 201 to step 205, user B can revise the version resource 4, the version resource 5 that belong to task Y, and with amended version resource 4, version resource 5, version resource 4 is uploaded to version control server with the contextual information of version resource 5 and the task items Y of task Y.
Below to Version Control client and version control server are described synchronously.
Please refer to Fig. 3,, comprising for the present invention carries out synchronous method flow diagram with Version Control client and version control server:
Step 301: the version resource of this locality preservation and the version resource in the version control server are compared;
Step 302: if having the version resource in version control server, to revise in the local version resource of preserving, then from version control server, obtain task items corresponding to the version resource of having revised;
Step 303: in the version resource that the version source synchronous that task items is comprised is preserved to this locality.
, to step 205 step shown in Figure 3 is elaborated below in conjunction with step 201.If user A revises the version resource 1, version resource 2 and the version resource 3 that belong to task X, and amended version resource is uploaded to version control server, please refer to Fig. 4, can may further comprise the steps:
Step 401: user C compares the version resource of Version Control client C and the version resource in the version control server;
Step 402: revise if find version resource 1, version resource 2, version resource 3, version resource 4 and version resource 5, user C chooses version resource 1, version resource 2, version resource 3, version resource 4 and the version resource of having revised 5;
Step 403: whether user C searches in version control server version resource 1, the contextual information of version resource 2, version resource 3, version resource 4 or version resource 5;
If have, enter step 404, otherwise, enter step 405.
Step 404: user C opens the contextual information of version resource 1, version resource 2, version resource 3, version resource 4 or version resource 5, enters step 405;
Step 405: user C obtains task items X and task items Y according to version resource 1, version resource 2, version resource 3, version resource 4 or version resource 5 in version control server;
If the user has opened the contextual information according to version resource 1, version resource 2, version resource 3, version resource 4 or version resource 5, can also in version control server, obtain task items X and task items Y according to the contextual information of version resource 1, version resource 2, version resource 3, version resource 4 or version resource 5.
Step 406: user C selects whether to open the version resource that task items comprised that gets access to;
If enter step 407, otherwise flow process finishes.Wherein, comprise all modifications in the version resource of task items the version resource.
Step 407: user C in Version Control client C, open all modifications that the task items obtained comprises the version resource.
When opening task items X, user C can find that version resource 1, version resource 2 and version resource 3 belong to same task.When opening task items Y, user C can find that version resource 4 and version resource 5 belong to same task.
In step 405 to the process of step 407, Version Control client C can be according to task items X, respectively version resource 1, version resource 2, version resource 3 are carried out synchronously with version resource 1, version resource 2, version resource 3 after the modification, respectively version resource 4, version resource 5 are carried out with version resource 4, version resource 5 after the modification synchronously according to task items Y.
Step 401 to step 407 has been described the step that user C compares all versions resource and version control server execution, need to prove, user C can also compare part version resource and version control server, for example, the local version resource and the version control server that will comprise version resource 1 compare, user C can find that version resource 1 revises, and Version Control client C carries out version resource 1 synchronously.At this moment, user C can search the contextual information whether version resource 1 is arranged in version control server, if having, can select to open.The more important thing is, user C also will obtain task items X in version control server, after getting access to task items X, user C can select whether to open all modifications among the task items X the version resource, in embodiments of the present invention, all modifications of task items X the version resource comprise version resource 1, version resource 2 and version resource 3.If user C select to open task items X all modifications the version resource, can also further select whether version resource 2 and version resource 3 to be carried out synchronously.
So far, if user A revises the version resource, and amended version resource and task items X be uploaded to version control server, if user B revises the version resource, and amended version resource and task items Y be uploaded to version control server, user C can learn which belongs to task items X in the version resource that changes according to task items when the synchronous version Control Server, which belongs to task items Y.Thereby, be convenient to user C the version resource of having revised is carried out taxonomic revision, put main line in order, increase work efficiency.
In addition, because user A and user B be when the upload version Control Server, the contextual information of the version resource of modification together is uploaded to version control server, can be when consulting the version resource of having revised with C, consult the contextual information of the version resource of making amendment, be convenient to understand.
Please refer to Fig. 5, be Version Control client of the present invention and version control server structural drawing.
For the Version Control client, in the process of upload version Control Server, comprising:
Revise unit 501, be used for the version resource is made amendment;
Task items creating unit 502 is used for according to revising the modification that the unit carries out the version resource, creation task item;
Uploading unit 503 is used for being uploaded to version control server with revising the version resource of unit modification and the task items of described task items creating unit establishment.
In carrying out synchronous process, comprising:
Contrast unit 504 is used for the version resource of this locality preservation and the version resource of version control server are compared;
Acquiring unit 505 has the version resource to revise in version control server if the contrast unit contrasts in the local version resource of preserving, and is used for obtaining task items corresponding to the version resource of having revised from version control server;
Lock unit 506, the version source synchronous that is used for the task items that acquiring unit obtains is comprised is in described local version resource of preserving.
For version control server, comprising:
Receiving element 507 has been used to receive from the modification of Version Control client version resource and task items;
Preserve unit 508, be used to preserve modification that described receiving element receives version resource and task items.
Associated methods embodiment, in the process of Version Control client upload version control server, the Version Control client can also comprise:
Record cell, be used for record modification the contextual information of version resource.
Carry out in the synchronous process in the Version Control client, the Version Control client can also comprise:
The contextual information unit, be used for searching the contextual information whether the version resource of having revised is arranged at described version control server, if described contextual information is arranged, then described contextual information is opened, described contextual information is used for making the user to understand the version resource that described version control server has been made amendment.
Version control server can also comprise:
Contextual information is preserved the unit, is used to preserve the contextual information from described Version Control client.
The step of above-mentioned each unit being carried out below in conjunction with method embodiment is elaborated.
User A makes amendment to the version resource of task A by the modification unit of Version Control customer end A in the Version Control customer end A, for example, version resource 1, version resource 2, version resource 3 is revised.User B makes amendment to the version resource of task B by the modification unit of Version Control customer end B in the Version Control customer end B, for example, has revised version resource 4, version resource 5.The contextual information of the recording unit records version resource 1 of Version Control customer end A, version resource 2, version resource 3.The recording unit records version resource 4 of version resource customer end B and the contextual information of version resource 5.
The task items creating unit of Version Control customer end A is according to task A creation task item X, and the task creation unit of Version Control customer end B is according to task B creation task item Y.The uploading unit of Version Control customer end A is with version resource 1, version resource 2, the version resource 3 revised, and version resource 1, version resource 2, the contextual information of version resource 3, task items X are uploaded to version control server.The uploading unit of Version Control customer end B is version resource 4, the version resource 5 revised, the contextual information of version resource 4 and version resource 5, and task items Y is uploaded to version control server.
The receiving element of version control server receives version resource 1, version resource 2, the version resource 3 from the modification of Version Control customer end A, the contextual information of version resource 1, version resource 2, version resource 3, and task items X.And, also receive version resource 4, version resource 5, the contextual information of version resource 4, version resource 5, and task items Y from the modification of Version Control customer end B.
The version resource 1 that the preservation unit of version control server receives receiving element is preserved to version resource 5, task items X and task items Y.Contextual information is preserved the unit contextual information that receiving element receives is preserved.
When the contrast unit of user C by Version Control client C, when the version resource of the version resource of Version Control client C and version control server is compared, discovery version resource 1 to version resource 5 is revised, task items X and task items Y that the preservation unit that the user utilizes the acquiring unit of Version Control client C to obtain version control server is preserved, user C can select the version resource of modification that task items X and task items Y are comprised to open.The lock unit of Version Control client C carries out the version resource 1 of preserving to version resource 5 and the version resource of having revised synchronously.
User C can also search whether version resource 1 is arranged in the contextual information unit of version control server, the contextual information of version resource 2, version resource 3, version resource 4 or version resource 5, if having, user C can select to open contextual information.
As can be seen, user C can learn which belongs to task items X in the version resource that changes according to task items when the synchronous version Control Server, and which belongs to task items Y.Thereby, be convenient to user C the version resource of having revised is carried out taxonomic revision, put main line in order, increase work efficiency.
In addition, because user A and user B be when the upload version Control Server, the contextual information of the version resource of modification together is uploaded to version control server, can be when consulting the version resource of having revised with C, consult the contextual information of the version resource of making amendment, be convenient to understand.
The present invention also provides a kind of version control system, comprising:
The Version Control client is used to make the user to revise the task items of task according to revising task creation, communicates with version control server, and version resource and the task items of having revised is uploaded to version control server;
The version resource of this locality preservation and the version resource in the version control server are compared, if have the version resource in version control server, to revise in the local version resource of preserving, then from version control server, obtain task items, in the version resource that the version source synchronous that task items is comprised is preserved to this locality corresponding to the version resource of having revised.
Associated methods embodiment, in the system embodiment of the present invention, relate to user A, user B, user C equally, Version Control customer end A, Version Control customer end B, Version Control client C, the operation that each user, each Version Control client, version control server are carried out is identical with method embodiment, specifically sees also the description of method embodiment.
At last, also need to prove, in this article, term " comprises ", " comprising " or its any other variant are intended to contain comprising of nonexcludability, thereby make and comprise that process, method, article or the equipment of a series of key elements not only comprise those key elements, but also comprise other key elements of clearly not listing, or also be included as this process, method, article or equipment intrinsic key element.Do not having under the situation of more restrictions, the key element that limits by statement " comprising ... ", and be not precluded within process, method, article or the equipment that comprises described key element and also have other identical element.
More than method, the Apparatus and system of Version Control provided by the present invention is described in detail, used specific case herein principle of the present invention and embodiment are set forth, the explanation of above embodiment just is used for helping to understand method of the present invention and core concept thereof; Simultaneously, for one of ordinary skill in the art, according to thought of the present invention, the part that all can change in specific embodiments and applications, in sum, this description should not be construed as limitation of the present invention.