1) Commit operation:
The commit operation performs two local commit operations in sequence.
Things:
A) judge whether CR is equal to Sr. If Cr <Sr, a conflict occurs and no submission is performed. If Cr = Sr,
Then, submit the operation.
B) Add 1 to both Sr AND Cr.
2) update operation:
The update operation updates modifications made by other users to the current update operation.
Things:
A) judge whether CR is equal to Sr. If Cr <Sr and local Cr <SR
If no modification is made, the CR = Sr is updated and no operation is performed.
B) Update Cr to make it equal to Sr.
3) Update special operation:
More powerful than update, with more parameters. If you want to discard the local modification and synchronize it with the server, you can
Use this operation. Select the "clean copy" check box (Note: Only for tortoisecvs users ). You can also select
The version that is synchronized to the server
4) checkout operation. Obtain the copy Cr from the server to make it equal to the SR.
The use of CVS has two operation orders: first, commit. If the conflict arises, update is executed; otherwise, update is not executed.
This operation order is called the commit priority method. Second, update the file first, modify the file, and then execute commit. If the conflict occurs,
You need to execute update again, and the order of this operation is called the update priority method. The update priority method is better, because
We recommend that you use CVS to detect conflicts earlier and take measures. Use cvs for the update Priority Method
As shown in. Note: N indicates the revision number in the figure. The red part is used to show the update conflict type.
Normally, this step is not performed.