CVS is a version control system that records the version information of the original file, which is suitable for multiplayer development of the same project. The source code is open. This article introduces some experience in WinCVS.
First, basic concept
(1) Repository warehouse: For all directories and all versions of all directories under the version control; CVS will complete the query and update of Repository.
(2) How the data is stored in the repository: With the difference in the CVS version, the storage structure changes, in general, the user does not need to understand how the data is stored.
(3) Revision: Each file is different, such as 1.1, 1.2.1, general 1.1 is the first RIVISION of the file, and one of the back will automatically increase the rightmost integer, such as 1.2, 1.3 1.4 ... sometimes 1.3.2.2, after seeing. Revision always even numbers. Under normal circumstances, the revision is performed as a number inside the CVS, and the tag can log user's specific information.
(4) TAG: Use symbolized representation method logo file specific Revision information. Usually do not need to be tag for a file, but a TAG is simultaneously for all files, and the user can submit or Checkout only to the specific TAG file. Another role is to indicate which files and which version it is available during the release software; each file can be included in a TAG. If you name an existing Tag default will not overwrite the original;
(5) Branch: Do not have any effect on additional BRANCH when the user modifies a BRANCH. The two versions can be combined by the merge method in appropriate time; Branch is always plus an even integer after the current revision (starting from 2, the end), so Branch is always an odd number, such as 1.2, back Branch It may be 1.2.2.1, 1.2.2.2 under the branch, ...
(6) Conflct: It is completely plain text conflict, does not contain logical contradictions, such as CVS cannot solve the problem: someone modified the parameters of the function f, while another person calls this function in another place with the old parameters . Text conflicts require users to participate in the solution, CVS cannot be saved automatically.
(7) Checkout: Use the code directory checkout to the specified directory, all files are Read-Write
Second, set an example and use problems
(1)
How to submit your own changes
Submit the source file for the server to the server using comm.
COMMIT to the server method is:
Select file, right to select Commit
Conflict: Multi-person will modify the same content at the same time. In the case of conflict, the two versions of the file are submitted again after the conflict is completed. Comparing two versions of different versions are:
You can use the comparison tool that comes with CVS, CVS will pass different parts through
<<<<<<<<<<<<
...
==========
...
>>>>>>>>>>>>>
make a list of;
You can also use other text comparison tools to compare (selected in the preference setting, selected in Query-Diff Setting);
(4) How Update
Select the changed file, right click to select Update
(4) Add files to the module
Divided into two types of text files and add binary files, don't make mistakes.
