1. Authentication: used to configure the authentication method of the CVS server. You can select other authentication methods from the drop-down list. However, you only need to select the default pserver mode, note that the authentication method must be the same as that specified in the CVS server configuration;
2. Path: used to configure the main directory path of CVS on the server, that is, the directory for CVS Initialization on the server, such as/home/cvsroot;
3. Host address: used to configure the address of the server where the CVS server is located. It can be an IP address or DNS name, for example, 10.104.1.204;
4. User name: used to configure the username to use wincvs to log on to the CVS server, for example, cvsyxwu. The administrator must add the user to the CVS user group for logon;
V. cvsroot: This option generally does not require modification. When you enter the preceding options, the system automatically generates the corresponding content of this option based on your input.
B. Set Global Options. On the previous interface, select "globals ":
This configuration item mainly focuses on the following options:
First, do not select checkout read-only. OtherwiseSource codeThe user is not allowed
Modify, and this option is selected by default;
Second, do not select prune (remove) empty directories. Otherwise, the empty directory is automatically deleted;
Third, if there are no special requirements for general configuration, set dirty files support, supply control when adding
Select from the TCP/IP compression option;
4. log on to the server:
Select Admin> login. The following dialog box is displayed, asking the user to enter the logon password.
After entering the password, select "OK". If the configuration of the CVS server and wincvs is correct, the following prompt will be displayed in the CVS status bar:
CVS-Z9-D: pserver: cvsyxwu@10.104.1.204:/home/cvsroot Login
Logging in to: pserver: cvsyxwu@10.104.1.204: 2401/home/cvsroot
* ***** CVS exited normally with code 0 *****
Code 0 indicates that the logon is correct. If an error occurs, it is code 1, and you need to modify it according to the error prompt.
5. Check out the corresponding modules on the CVS server:
First, select the directory where the checkout module is to be stored in modules in workspace;
2. Select create-> checkout modeles. The following dialog box is displayed:
Among them, Module name and path on the server is the directory to store the checkout content, which is input by the user; and local folder to checkout to is the directory selected by the first user.
6. Submit the file to the CVS server after modification.
A) Only one user can modify the file.
Use your favorite editor to modify the file generated by checkout. The modified file will be red before it is submitted, for example, example. h file:
Select the red file example. h, right-click and select the "Commit selection" option. If no other user has modified the option and submitted it to the CVS server, the example will be executed normally. submit the H file to the CVS server and restore the icon to the original color.
B) When two or more users modify different parts of the same file
In this case, both user a and user B Checkout the file example. h. The content is as follows:
Int callby (INT count)
{
Printf ("excelstor! \ N ");
}
Void main (INT argv, char * argc)
{
// Added by my CVS
Printf ("I am Cather \ n ");
}
Int mainexample ()
{
Printf ("OK \ n ");
}
Then, user a is modified to the following and submitted to the CVS server (usually normal ):
Int callby (INT count)
{// Add
Printf ("excelstor! \ N ");
}
Void main (INT argv, char * argc)
{
// Added by my CVS
Printf ("I am Cather \ n ");
}
Int mainexample ()
{// Add
Printf ("OK \ n ");
}
Then modify user B to the following:
Int callby (INT count)
{// Add
Printf ("excelstor! \ N ");
}
Void main (INT argv, char * argc)
{
// Modified
Printf ("I am Cather \ n ");
}
Int mainexample ()
{// Add
Printf ("OK \ n ");
}
When user B selects "Commit selection", the following message is displayed:
CVS server: up-to-date check failed for 'example. H'
CVS [server aborted]: Correct abve Errors First!
This indicates that a user has modified the same file example. h and submitted it to the CVS server.
You must first select "Update selection" for the local example. h and example. H files on the CVS server.
Synchronization and merge. Select "OK" without selecting any options. The following figure is displayed:
CVS-Z9 update example. H (in directory c: \ my CVS \ STW \ SRC \)
RCS file:/home/cvsroot/STW/src/example. H, V
Retrieving Revision 1.5
Retrieving revision 1.6
Merging differences between 1.5 and 1.6 into example. h
M example. h
****** CVS exited normally with code 0 ******
indicates that the modification between user B and user a has been merged successfully, and the file example is also used. the H icon is also red, and the merged file is stored on user B's local machine. To update to the CVS server, you must also select example. h. Right-click and select "Commit selection" to submit the modified results of user a and user B to the CVS server. Note: M indicates that the file has been modified.
C) when two or more users modify the same part of the same file
This is because both user a and user B have downloaded the file example. h. Content:
void main (INT argv, char * argc)
{< br> printf ("I am Cather \ n ");
}< br> then user a changes the file to the following and submits it to the CVS server (normally, the file will be submitted normally):
void main (INT argv, char * argc)
{< br> printf ("I am Cather \ n");
printf ("I am pat \ n ");
}< br> then user B changes the file to the following:
void main (INT argv, char * argc)
{< br> printf ("I am Cather \ n");
printf ("I Love You Cather \ n ");
}< br> If user B selects "Commit selection" to submit the Modification result to the CVS server, the following error message is displayed:
CVS-Z9 commit-M "update in 11: 20" example. H (in directory c: \ my CVS \ STW \ SRC \)
CVS server: up-to-date check failed for 'example. h'
CVS [server aborted]: Correct abve Errors First!
* ***** CVS exited normally with code 1 *****
It indicates that the modification of user B conflicts with that of other users. In this case, select "Update selection". The following prompt is displayed:
CVS-Z9 update example. H (in directory c: \ my CVS \ STW \ SRC \)
RCS file:/home/cvsroot/STW/src/example. H, V
Retrieving revision 1.9
Retrieving revision 1.10
Merging differences between 1.9 and 1.10 into example. h
Rcsmerge: Warning: conflicts during merge
CVS server: Conflicts found in example. h
C example. h
* ***** CVS exited normally with code 0 *****
C In front of example. h indicates that there is a conflict with other users' modifications, and the file icon will display a "C", as shown below:
Double-click example. h to display the content of example. H, as follows:
Void main (INT argv, char * argc)
{
Printf ("I am yanxi \ n ");
Printf ("I am Cather \ n ");
<Example. h
Printf ("I Love You yanxi, too! \ N "); // This part is your Modification
========
Printf ("I Love You Cather! \ N "); // This part is modified by other users.
>>>>>>>> 1.10
}
In this case, you should negotiate with user a to determine the final modification. For example, you can change it:
Void main (INT argv, char * argc)
{
Printf ("I am yanxi \ n ");
Printf ("I am Cather \ n ");
Printf ("I Love You yanxi, too! \ N "); // This part is your Modification
Printf ("I Love You Cather! \ N "); // This part is modified by other users.
}
Select "Commit selection" for submission. The following prompt message is displayed:
CVS-Z9 commit-M "update in 11: 20" example. H (in directory c: \ my CVS \ STW \ SRC \)
Checking in example. h;
/Home/cvsroot/STW/src/example. H, v <-- Example. h
New Revision: 1.11; previous revision: 1.10
Done
* ***** CVS exited normally with code 0 *****
Indicates that user a and user's modifications have been merged successfully.
In this way, the problems encountered when submitting files to the CVS server are basically the same. You need to modify the files based on the actual problems encountered.
7. Add a new file to the CVS server
After adding a file locally, submit it to the server. Select the file, click "add", add the file, and select "Commit selection" from the context menu.
, Select the file example. h. bak, because example. h. bak is currently not a CVS file. In this case, the "Add button" is changed from "not available" to "available". Therefore, "noncvs file" is displayed in the status, and "Add button" is selected for example. h. the Bak icon turns red and adds a letter as follows:
Select example. H. Bak, right-click, and select "Commit selection" to submit the example. H. Bak file to the CVS server to become a CVS file.
8. Conclusion
Here, you can basically configure a practical CVS server and wincvs client for yourself or your company to use cvs for system development or version management and control of other documents.
Start building with 50+ products and up to 12 months usage for Elastic Compute Service
1 on 1 presale consultation
24/7 Technical Support 6 Free Tickets per Quarter Faster Response
Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.
A comprehensive suite of global cloud computing services to power your business
Payment Methods We Support
