CVS Merge...CVS 合并www.shengfang.org
Abstract

Update one branch with changes from another branch.  把另一个分支的修改合并到本分支

Note
TODO: Write... 待写www.shengfang.org
CVS Make New Module CVS创建新模块
Abstract

Create a new module (project) in the CVS repository. 在CVS仓库中创建新模块（项目）

Note
TODO: Write...待写
Watching And Locking监视和锁定
Abstract

Track who is editing which files. 跟踪谁正在编辑这个文件www.shengfang.org

Note
TODO: Write... 待写
Finding Out Who to Blame: CVS Annotate找出谁的失误：CVS批注
When something suddenly stops working, it can be valuable to find out exactly who is to blame for the change. This is what CVS Annotate is for. 如果一个项目突然被终端了，准确找出谁是这个错误修改的责任人是非常重要的，这就是CVS注释的用途

Figure 5.1. Annotate Dialog批注对话框www.shengfang.org

For each line of the file, the dialog shows 在文件的每一行，对话框显示

From which revision that line originates (e.g. lines marked as 1.1 have not been changed since the first revision of the file). 每一行的修改原因涉及版本（例如标志为1.1版本的代码行没有修改记录，因为这是文件的第一个版本）www.shengfang.org

The author of the line, i.e. the person who made the last change. 本行的作者，也就是谁修改了这行

The time and date when the line was last changed. 修改时间日期

The current content of the line. 本行的当前内容www.shengfang.org

www.shengfang.org
If you right-click a line in the dialog, you have the option of launching various commands, including viewing an annotation for a particular revision. 在对话框的某一行右键，你可以选择不同的命令操作，包括查看指定版本的批注

Also, you can change the appearance of the dialog by choosing between various highlighting options. 还有，你可以改变对话框的显示界面，选择不同的高亮选项
Showing More Information: CVS Explorer Columns显示更多信息：CVS资源管理器列头
In Details view, TortoiseCVS can show CVS-specific columns in the Explorer view (only on Windows 2000 and later). The available columns are 在资源管理器的详细显示模式，TCVS可以显示一些CVS的特殊的列头（对于WIN2000以及以后版本有效）可以选择的列头有

CVS RevisionCVS版本 CVS Sticky Tag 粘性标签 CVS Status 状态 CVS File Format文件格式

To select which columns to display, right-click on the header as shown in the figure below. Select More..., and you will see a dialog listing all the available columns on your system. Scroll down to find the "CVS" columns and select the ones you want. 选择显示哪些列头，右键资源管理器列头，选择 其他。。。，你可以看到一个对话框列举了你系统有效的列头，滚动找到CVS相关的列头，选择你想要显示的www.shengfang.org

Figure 5.2. Choosing which columns to display选择显示哪些列头

Keyboard Shortcuts键盘快捷键www.shengfang.org
TODO: This section will explain how to use TortoiseCVS without the mouse. 本节显示如何不通过鼠标使用TCVS
How Web Log Autodetects the Server URLWEB日志如何自动检测服务器网址
As mentioned in Web Log, TortoiseCVS can in many cases automatically detect the URL used by your ViewCVS or CVSweb server. It does this by using the following algorithm: 正如在WEB日志中提及的，TCVS可以自动检测你的VIEWCVS或者CVSWEB服务器的网址，它按照如下规则进行：

Start with the name of the CVS server, with a http:// prefix. HTTP://前缀，用CVS服务器的名称开始

Append one item from the list 后面加上如下列表中某项www.shengfang.org

/cgi-bin  /viewcvs /cvsweb  /bin  (the empty string) 空白字符串

and an item from the list 下列列表中的某项www.shengfang.org
/viewcvs.cgi /viewcvs /cvsweb.cgi /cvsweb.pl  /cvsweb

Append the relative path for the file or folder (i.e. the value of 'Repository' shown in the CVS Properties dialog). 增加关联的文件或者文件夹路径名称（也就是说CVS属性对话框中的仓库值）

Check if the computed URL works. If not, add ?cvsroot= followed by the name of the module and try again. 检测获得的网址是否工作正常，如果不正常，增加 ?CVSROOT＝模块名称 再尝试

The above steps are done for each possible permutation of the different prefixes and suffixes. If a URL is found which returns HTTP status 200 (OK), the search stops. If no such URL is found, and an URL is found which returns HTTP status 401 (Denied) or 403 (Forbidden), that URL is used (based on the assumption that the user will be allowed access after authenticating to the web server). 以上的步骤都会把不同的前缀和后缀进行尽可能的排列组合，如果网址能够访问，返回HTTP状态200正常，搜索中断，如果任何网址都找不到，但是有一个网址能够访问但是返回HTTP状态401拒绝访问或者403隐藏的，这个网址仍然被当作有效（基于如下假设：用户可以通过WEB服务器的认证，允许访问）www.shengfang.org