WinCVS Concise Manual
Li Xin
4. After modifying the submission file, after the CHECKOUT project, the copy of the file will be created locally. After the client modifies (commit) to the server, you can save the latest file to the server as shown below, the modified file display Red. At this time, the modification only modifies the local file. If you want to submit it to the server side, click Select the modified file, and then select the "Commit Selection" command from the Right-click menu to the service break, the file version will automatically add 1. V. Update file - Update the server file to the local file in the local file, it is best to update the file from the server, because many people operate the same file, without timely update, it is easy to cause conflicts. If the version of the ALA is the same as 1.2, the version of the revised submission is 1.3, and B is not updated at this time, and the submission is modified on the basis of local 1.2. At this time, there will be a conflict as follows, and the conflict file will be displayed. Update the file, click Select the file (can be selected), select the "Update Selection" command from the Right-click menu to the local. 6. After adding a file, you will be submitted to the server after adding a file locally. First select the file, then click "Add button", after adding the file, then select the submit command "Commit Selection" in the right-click menu. Note that there are two buttons, an adding a general file; a binary file, such as a picture file. Seven, delete files 1. After selecting the file, click the Delete button to delete the file locally. 2. After deleting, select the "Commite Selection" command from the right-click menu to delete the server's file. 8. Retrieve the deleted file If you just click the Delete button to delete the file, click the Add button to retrieve the file. If you have been submitted to the server, delete the file from the server, you should establish a file with the same name locally (can be empty file), add the file to the server, at this time, you can find the lost file, just Upgrade a version of the local created file on the basis of the deleted version. The historical version of the file still exists. If you want to overwrite the current version, the easiest way is to merge (MERGE). Nine, the third Tab is the merge option when the Merge is incorporated in the UPDATE file (Merge). That is, the merged file is performed by Update. As described below, there are several merged methods. As shown above, the V_DS version is overridden in another v_xj. As shown above, the V_DS version is merged with the current version, and the version specified in ONLY THIS Reg./tag is merged with the current version, usually there is a conflict.
