0216 tortoisecvs ssh putty autoauth

不需要 PUTTY的方法：

工具选择：F:\\Program Files\\TortoiseSVN\\bin\\TortoisePlink.exe

参数为：-l "%u" "%h" -i N:\\Green\\internet\\putty\\三四.ppk

Key Generation: PuTTY
To generate a SSH key using PuTTY:
Execute the PUTTYGEN.EXE program.
Select the desired key type, "SSH2 DSA", within the "Parameters" section.
Click on the "Generate" button.
Follow the instruction to move the mouse over the blank area of the program in order to create random data used by PUTTYGEN to generate secure keys. Key generation will occur once PUTTYGEN has collected sufficient random data.
Enter USERNAME@shell.sourceforge.net or USERNAME@cf.sourceforge.net for the key comment, depending on what host the key is for, replacing USERNAME with your SourceForge.net username.
Enter the desired passphrase in the "Key passphrase" and "Confirm passphrase" fields. If the key will be used for automation of operations (i.e. as part of a script), you may choose to omit this step from the key generation process.
Click on the "Save private key" button. Use the resulting dialog to save your private key data for future use. You may use a filename such as "SourceForge-Shell.ppk" or "SourceForge-CF.ppk". The .ppk extension is used for PuTTY Private Key files.
Go to the SSH key posting page on the SourceForge.net site. Copy your public key data from the "Public key for pasting into OpenSSH authorized_keys2 file" section of the PuTTY Key Generator, and paste the key data to the provided form on the SourceForge.net site. Click on the "Update" button to complete the posting process.
Exit the PuTTY Key Generator (PUTTYGEN).
Key data sync to hosts from the SourceForge.net site occurs on regular intervals. Your key data will be synchronized to the designated servers (either shell and CVS, or the Compile Farm) after a short delay.

Developer CVS Access via SSH
Only project developers can access the CVS tree via this method. A SSH client must be installed on your client machine. Substitute modulename and developername with the proper values. Enter your site password when prompted.
Project administrators may limit CVS access to this repository using cvs_acls or the CVS access member permissions option. Developers may verify their CVS access status on the admin page for this project.
A significant amount of information about project CVS services may be found in our "CVS (Version Control for Source Code)".
Developers may also make use of shared SSH keys for authentication.
export CVS_RSH=ssh
cvs -z3 -d:ext:developername@cvs.sourceforge.net:/cvsroot/sharpcvslib co -P modulename
NOTE: UNIX file and directory names are case sensitive. The path to the project CVSROOT must be specified using lowercase characters (i.e. /cvsroot/sharpcvslib)

新建一个模块后，CHECK OUT提示
cvs.exe checkout: in directory .:
cvs.exe checkout: cannot open CVS/Entries for reading: No such file or directory

原来：
4.测试Checkout功能：右键菜单-〉cvs->checkout 选择一个模块名test,如果不知道的话，可以使用获取列表的功能
5.ok,提示cvs操作成功，但是我们什么都没看到，自己查看输出信息，其中包含了cannot open CVS/Entries for reading: No such file or directory，什么意思呢，原来cvs中的模块为空时，它无法取得任何实体，就什么都不生成了，解决的方法很简单，就是在新建的模块中添加一个文件，并提交，再测试一下，果然，cvsAdmin自动为我们生成了。

首先你必须是该项目的管理者或者项目参与者。
其次你必须已经在个人选项里的Account Maintenance菜单里Shell Account Information部分编辑上传了自己的RSA公钥。（见帐号维护（2））
如果你确信已经上传了RSA公钥，则接下来：
1、在GRO文档项目的文件发布区下载并安装WinCvs136.zip和Python-2.1.2.exe；
2、运行WinCVS，点击Admin >> Preferences，基本选项如下：
Authentication : ssh
Path : /cvs/你的项目名
Host address : 你在putty里生成的Session名
User name : 不需要填写，空出即可
CVSROOT : WinCVS根据你上面的填写自动生成，不要更改它
然后点击Authentication编辑框右边的Settings，选中If ssh is not in the PATH :，然后浏览选择出你解开的putty（见帐号维护（2））工具包中的plink.exe程序。OK即可。WinCVS的设置完成。
3、当你需要访问CVS时，运行WinCVS后，记住同时运行putty工具包中的pageant.exe，pageant.exe会出现在Windows系统托盘里，右键点击之，Add Key，选择出你前面用putty生成的密钥文件，输入passphrase，则pageant.exe将自动跟踪WinCVS使用的密钥对。

三，设置passphrase后，让系统自动登录打开pageant.exe，右击右下角的pageant.exe的图标，"add key"，选择刚刚生成的私匙如id_rsa2.ppk，OK，只要打开pageant.exe，以后就不用输入passphrase，系统就可以自动登录了。pageant 的作用是将解加密的 private key 放在内存里，需要的时候调用。======================================================================可能出现的几种问题： 1、Server refused our key 公匙和私匙不匹配，或者没有 authorized_keys 文件解决方法：这个问题大多是使用puttygen.exe生成ssh2格式的密匙和Linux上面的不一样，照着上面的改（只是增加ssh-rsa）就可以了。2、Unable to use key file "id_rsa1.prv" (SSH1 private key) 私匙文件的格式不正确或登录类型没有设置正确解决方法：打开puttyàSSH选项时，“Preferred SSH protocol version:”，这时如果你用SSH1协议，就选择“1”，如果你使用SSH2协议就选择“2”，这个大多是你生成的是SSH1协议的密匙，而putty登录类型选择为protocol 2。

知道呢为什么TSVN不行的原因，因为默认设置是:\\Program Files\\TortoiseSVN\\bin\\TortoisePlink.exe 之类的，要改为 plink.exe程序 作废

看到SINA BLOG的信息
Warning: mysql_connect(): Too many connections in /data1/apache/htdocs/blog_pub/include/my_dbfairy.2.0.class.php on line 827

好大一个文件，到827行才 mysql_connect ，命名好像也不是很好到样子
  HOME┊我的控制面板┊搜索┊帮助 
 
 　对不起，您访问的文章不存在或者已被作者删除。
　1、如果您想浏览此作者其他文章，请点击此处。
　2、如果您想回到新浪BLOG首页，请点击此处。

网上总是能够看到紫光拼音4.0版本，但是每每又声称是非官方版本

紫光拼音输入法是一个完全面向用户的，基于汉语拼音的中文字、词及短语输入法。提供全拼和双拼功能，并可以使用拼音的不完整输入（简拼）。双拼输入时可以实时提示双拼编码信息，无需记忆。大容量精选词库，收录8万多条常用词、短语、地名、人名以及数字，优先显示常用字词，而字词的使用频度（词频〕则从一亿七千万字语料中统计而来。支持GBK大字符集。智能组词能力：对于词库中没有的词或短语，紫光拼音输入法可以搜寻相关的字和词，帮您组成所需的词或短语。组词算法同样以一亿七千万字语料的统计信息为基础，组词速度快，准确率高。词和短语输入中的自学习能力：包括自动造词、动态调整词频、自动隐藏低频词。智能调整字序，可根据用户前一次的输入情况，动态调整汉字的优先选择顺序。

4.0 的紫光更名为 紫光华宇拼音，我在网上下载到了内部测试的泄漏版并制作成了增强版。

今天总算知道了正式来源，原来是当年赫赫有名的PAULGAO，高春晖，也算是我这么多年看着他起破解，天下，卓越，手机，如果正式论起来，他做下载比华军还早一些吧。

http://www.paulgao.com.cn/index.php?itemid=68

原来紫光的测试版都是从这里传出来的，我终于找到窝点了。现在外面流行的这个版本可是7月21日放出来的，没想到高某7月1日就搞到了。
估计那位释放的版本就是从高这个版本修改而来的吧，既然PAULGAO弄出来的，我就试一试，感觉还可以，就是界面花哨了一些，有点不习惯。

TortoiseCVS is an extension for Microsoft Windows Explorer that makes using CVS fun and easy. Features include: coloured icons, tight integration with SSH, and context-menu interactivity.

Notes
 
Release Name: TortoiseCVS-1.8.18

Notes:
Maintenance release.

——————————————————————————–
Changes:
In the Checkout dialog, it is no longer possible to select the :ssh: protocol
(due to numerous problems with it). (Torsten)

http://tortoisecvs.org/download.shtml now links to the new tcvswix project
(run by Kevin Cheng), which provides Windows Installer (.msi) packages of
TortoiseCVS.

Added Simplified Chinese User Guide from shengfang. (Torsten)

Fixed bug 1238005: Escape doesn\’t close Revision Graph dialog. (Torsten)

Applied patch 1221620: Update command does\’t refresh overlay of files. (Torsten)

呵呵：Added Simplified Chinese User Guide from shengfang.

昨天给TCVS作者发了一份EMAIL，询问了一下翻译事宜，对方回答if you
create a CHM version of your Chinese user guide, I will be happy to add
it to the distribution. 我就开始做了，不过他好像提到：the
English and French user guides are created from an XML file, which is
processed by a toolchain in order to produce CHM.

我不明白这些东东，继续按照我的既定步骤开始www.yippeesoft.com

1、反编译 UserGuide_en.chm 利用HH.EXE反编译: 用法:c:\\windows\\hh.exe -decompile 源文件的保存路径 要反编译的chm 也可以 HTML Help Workshop

2、Microsoft Office FrontPage 2003 编辑HTML文件，将翻译文本替换英文文本，所有连接的地方保留因为文本，刚开始忘了修改TITLE标题，结果CHM目录显示的还是英文。只好又修改了一遍

3、用CHM制作软件，HTML Help Workshop好像太麻烦了。试验了 www.yippeesoft.com

htm2chm is a useful program that allows you to convert html pages with graphics as well as whole sites (for example, retrieved by offline browsers) into a single CHM file. 但是好像太简单了，什么东西都不能设置

WekaSoft Visual CHM v4.3 Visual CHM 将帮助您非常容易的制作出具有非常专业水准的CHM文件，而且是“所见即所得”。 好像比较容易非法错误，致命的一点是我生成不了CHM文件，总是出错；而且TCVS的HTML文件编码很奇怪 例如 <title>
&#31532;&#19968;&#31456;. &#20837;&#38376;</title>  第一章. 入门 ，它就没有办法认识

最后使用 EasyCHM是国华软件推出的一款强大的CHM电子书或CHM帮助文件的快速制作工具。这个不错，简单方便快捷，但是好像图片总是显示不了，因为HTML文件调用的图片在IAMGES目录下，而它好像是把它弄到了根目录，最后利用它去掉 CHM 设置－常规－自动删除在CHM的生成过程中产生的HHP/HHC/HHK文件选项，再把 html.HHP 文件 用 HTML Help Workshop 打开，然后再 change project option，在option －COMPLIER里面的 DON\’T INCLUDE FOLDERS IN COMPILED FILE选项去除掉，这下生成的CHM文件正常了。可以显示图片了。www.yippeesoft.com

最开始碰到HTML不能显示图片的问题的时候，试图把HTML转换成为MHT文件，呵呵，最后生成的CHM文件居然有33M？！

试验了两种编程方法：www.yippeesoft.com

WebBrowser1.Navigate "127.0.0.1"
WebBrowser1.ExecWB OLECMDID_SAVEAS, OLECMDEXECOPT_DONTPROMPTUSER, "4", "c:\\1.mht" 试图采用WEBBROWSER进行另存

Dim message As New CDO.message
Dim Outstream As ADODB.Stream
Dim ii As String
ii = Dir("P:\\html\\html\\*.html")
While ii <> ""
    Call message.CreateMHTMLBody("file://P:/html/html/" + ii, CDO.CdoMHTMLFlags.cdoSuppressNone, "", "")
    Set Outstream = message.GetStream
    Call Outstream.SaveToFile("P:\\html\\1\\" + Left(ii, Len(ii) – 4) + "mht", ADODB.SaveOptionsEnum.adSaveCreateOverWrite)
    ii = Dir
Wend
在工程中必须要引用一个库：www.yippeesoft.com
Library CDO  D:\\WINNT\\System32\\cdosys.dll
Microsoft CDO for Windows 2000 Library
其次，需要Stream对应的接口的支持，如果你一时找不到就使用支持这个的较新的ADO就行了，如
Library ADODB  D:\\Program Files\\Common Files\\system\\ado\\msado15.dll
Microsoft ActiveX Data Objects 2.5 Library

最新版本的TCVS集成了我翻译的用户手册

How CVS Differs from Microsoft Visual Source Safe?

TortoiseCVS differs from Visual Source Safe? (VSS) in many ways. The most apparent difference may be that TortoiseCVS does not require users to lock the files they are working on, as VSS does by default. In fact, the CVS documentation even encourages users not to use file locking. In the rare occasion where several people have changed the same file at the same time, CVS will normally be able to merge their changes. If two or more developers have changed the same few lines, TortoiseCVS will report a conflict, insert directives in the file, and leave it to the developers to decide what to do. Such conflicts are very rare, as they normally occur as a result of lacking communication between the developers (eg. two people trying to fix the same problem).
Another important difference is that VSS gives you a server view, while TortoiseCVS shows a client view. In practice this means that, unlike VSS, TortoiseCVS will not tell you about changes in the repository until you do an update, or explicitly query the status of selected files. Changes reported by TortoiseCVS reflect modifications done by you after the last checkout, update or commit.
CVS 和 Microsoft Visual Source Safe?

TCVS和Visual Source Safe? (VSS) 很多地方不同. 最明显得一点是TCVS不需要锁定正在处理的文件，而VSS默认锁定t.实际上, CVS 文档鼓励用户不使用文件锁定. 几个用户同时修改同一个文件的可能性是很小的, CVS 可以正常的合并他们的冲突. 如果两个或几个人修改了文件的相同行, TortoiseCVS 将包括冲突, 在文件中插入指示, 让开发员决定如何解决. 这种冲突非常稀少, 通常只是出现在缺少沟通的情况下导致如此结果 (例如两个人试图解决同一个问题).
另外一个重要的不同，VSS 是显示服务器视图, TortoiseCVS显示客户端试题. 从实际上来说, 不像 VSS, TortoiseCVS不会主动通知你仓库的变化，除非你自己进行更新, 或者询问一些文件的状态. TortoiseCVS包括的修改状态只是反应你最后一个取出、更新、提交之后的修改
Creating new icons for TortoiseCVS

TortoiseCVS icons are Windows icon files that are overlaid on top of source code file icons in Explorer to show their status in CVS. The reason this technique works is that most of the area in a TortoiseCVS icon is transparent, allowing the source icon to show through. If you are designing your own TortoiseCVS icon set, you\’ll need to strike a careful balance between visibility of the original file and easy viewing of CVS states. Some icon sets achieve this balance by adding a distinctive colour or shape to one corner of each icon; others achieve the illusion of shading the entire icon by alternating transparent pixels with coloured ones. You can even combine these two ideas of unique shapes and semitransparent shading: see the "NG" icon set that ships with TortoiseCVS for an example.
Create your icon set using a graphics editor. For the best viewing results, you should create 16×16, 32×32, and 48×48 versions of each icon. The icon editors that ship with the Borland and Microsoft compilers can do this task easily, as can most shareware icon editors. If you prefer to stay with free software, you can use The GIMP to create a PNG file for each icon size, and then combine them together with png2ico.
Make sure you have created one correctly-named icon for each of the seven possible CVS states: TortoiseNotInCVS.ico, TortoiseInCVS.ico, TortoiseInCVSReadOnly.ico, TortoiseChanged.ico, TortoiseConflict.ico, TortoiseAdded.ico, and TortoiseIgnored.ico.
Create a folder inside the directory where you installed TortoiseCVS, name it something that matches the theme of your icon set, and copy your seven new icon files into the new folder.
Open the Registry Editor (Click Start → Run and type regedit). Navigate to HKEY_LOCAL_MACHINE\\SOFTWARE\\TortoiseCVS\\CustomIcons. Inside this key, create a new string value. For the name of this new value, type in the name that you would like to call your new icon set. Double-click on the new value to set the actual data, which is the name of the folder you created in step 3.

为TortoiseCVS创建新图标www.yippeesoft.com

TortoiseCVS 图标是Windows图标文件，它们重叠在源码图标上，在资源管理器上显示 CVS状态. 这个技术的原理是TCVS的图标大部分区域都是透明的, 允许源码图标穿透显示如果你想设计自己的图标,你需要小心的权衡原有文件图标的可见度以及明显得CVS状态显示. 有些图标达到这种平衡，增加醒目的颜色，遮盖每个图标的角落; 有些用彩色进行交互透明象素. 你可以集合这两个唯一遮盖主意和半透明遮盖: 参见 "NG" 图标，TCVS的例子.
用一个图象编辑器制作图标. 为了最佳显示效果，每个图标应该创建32*32，16*16、48*48版本. Borland and Microsoft 编译器自带的就不错, 能够达到大多数共享软件的效果.如果你喜欢免费软件，使用 The GIMP 为图标每个尺寸制作一个PNG文件, 用 png2ico 转换.
你要为CVS的七种状态制作正确的图标命名: TortoiseNotInCVS.ico, TortoiseInCVS.ico, TortoiseInCVSReadOnly.ico, TortoiseChanged.ico, TortoiseConflict.ico, TortoiseAdded.ico, and TortoiseIgnored.ico. www.yippeesoft.com
在TortoiseCVS的安装目录下创建文件夹, 用符合你图标主题命名，把七个新图标拷贝进去.
打开注册表 (点击 开始－允许 输入 regedit). 定位到 HKEY_LOCAL_MACHINE\\SOFTWARE\\TortoiseCVS\\CustomIcons. 在这个键值里面, 创建新的字符串值，在名称处输入你的图标命名，双击新值，输入实际数据，你在第三步定义的文件夹名称.

Using PuTTY sessions

If you need different SSH parameters for different hosts, you can do so by using a feature of the PuTTY suite called sessions.
Download the PuTTY suite from the PuTTY site.
Run putty.exe and enter the required parameters, then enter an appropriate session name below the Saved Sessions label, and click Save.
In the TortoiseCVS Checkout Dialog, enter the session name instead of the host name.
使用PUTTY
如果你需要用不同的SSH参数访问不同的主机，你可以使用PUTTY的一个功能称之为 会议
从PUTTY网址下载PUTTYwww.yippeesoft.com
运行PUTTY.EXE，输入需要的参数，输入一个适当的会议名称，并且保存
在TCVS取出对话框，输入会议名称代替主机名称
Using Pageant to avoid having to enter the SSH password every time
使用Pageant免除每次输入SSH密码
When using SSH, you normally have to enter your password every time you do a CVS operation. To avoid this, while maintaining a reasonable level of security, you can use an SSH Agent. The SSH Agent in the PuTTY suite is known as Pageant.
如果使用SSH，正常情况下你每次进行CVS操作都需要输入密码，为了避免这个麻烦，维持一个适度的安全等级，你可以使用SSH代理，在PUTTY称之为 游行www.yippeesoft.com
Download the PuTTY suite from the PuTTY site.  下载
Run pageant.exe. Right-click on its icon  in the system tray and select Add Key, then browse to your private key file. If the key is password protected, Pageant will ask for the password.
To avoid having to do the above every time you boot up your computer, create a shortcut to Pageant in your Programs → Startup folder, specifying the key file as argument.
TODO 运行PAGEANT.EXE，右键点击系统图标栏上的图标，选择 增加 ，将显示你的私钥，如果私钥是密码保护的，PAGEANT将询问密码，为了让每次计算机重启之后重复上述步骤，你可以创建一个快捷方式在 程序组－启动 目录，指定私钥文件作为参数

Progress Dialog

Figure?6.7.?Progress Dialog

This dialog shows each CVS command that TortoiseCVS executes, as well as any information, errors, or warnings generated by CVS. The different types of messages are highlighted in different colours (you can customize these colours using the Appearance tab in the Preferences dialog).
During an Update, the Progress Dialog indicates whether or not each file has changed in CVS or on the local PC, using the following single-letter codes:
C
The file has changed both in CVS and locally. TortoiseCVS attempted to merge both sets of changes into the local copy, but could not (probably because both changes were made to the same part of the file). For more information, see Resolving Conflicts.
M
The file has only changed on the local PC. TortoiseCVS will not change the local copy.
P
The file has changed in CVS, and TortoiseCVS has updated the local copy to match
U
The file exists in CVS, but not on the local machine. TortoiseCVS will create a copy on the local PC. You will also see this for files which have changed in CVS (as for U.
A
The file has been added to CVS, but not yet committed.
R
The file has been removed from CVS, but not yet committed.
进度对话框

Figure?6.7.?进度对话框

对话框显示TCVS运行的每个CVS命令的信息，包括CVS命令产生的运行信息、错误、警告，不同的命令类型用不同的高亮标识，你可以定制这些颜色（属性对话框－外观） Appearance .
Update, 在更新过程中，进度对话框指示每个文件是在CVS中被修改还是在本地被修改，用如下字母标志:
C
这个文件在CVS和本地都被修改，TCVS尝试合并双方的修改到本地文件中，但是失败（可能由于双方修改了文件的同一部分）更多信息 合并冲突 Resolving Conflicts.
M
本地文件被修改，TCVS不会改变本地文件.
P
CVS仓库文件修改, TCVS将更新本地文件
U
文件存在仓库中，不存在于本地，TCVS将创建本地拷贝，有时还可能是CVS仓库中的文件已经被修改更新.
A
文件加入CVS，但是没有提交.
R
文件被标明移除，但是没有提交.

About Dialog

Figure?6.19.?About Dialog

The About dialog shows the version of TortoiseCVS itself as well as the CVS client it uses, and the SSH application you have configured.
TODO: Describe and show dialog with and without CVS server version
关于对话框

Figure?6.19.?关于对话框

关于对话框显示TCVS的版本信息以及CVS客户端版本信息，你配置的SSH程序信息
TODO: 描述并显示对话框（有无服务器版本信息）

CVS Merge…CVS 合并www.yippeesoft.com
Abstract

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

Note
TODO: Write… 待写www.yippeesoft.com
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.yippeesoft.com

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.yippeesoft.com

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.yippeesoft.com

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.yippeesoft.com

www.yippeesoft.com
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.yippeesoft.com

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

Keyboard Shortcuts键盘快捷键www.yippeesoft.com
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.yippeesoft.com

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

and an item from the list 下列列表中的某项www.yippeesoft.com
/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.yippeesoft.com

Finding Out What Has Changed: CVS Diff…找出修改内容：CVS差异
Abstractwww.yippeesoft.com

Compare a local file to a version in the CVS repository. 比较本地文件和CVS仓库中的某个版本

To compare a file to a different version from the CVS repository, select the desired file and right-click on it. 从CVS仓库中比较不同的版本，选择文件，右键www.yippeesoft.com

Select CVS → Diff from the context-menu. 选择CVS－差异 菜单

If this is the first time you have used TortoiseCVS\’s Diff feature, you will be asked to select an external diff application. WinMerge and ExamDiff are both available free of charge and are well-suited for text-based source code. If you are developing in the LabVIEW programming language, you can use LVDiff to compare your block diagrams visually. CSDiff is designed to compare different versions of Word documents. To use a combination of diff tools based on the file type you are comparing, try meta-diff. 如果你第一次使用TCVS的比较差异功能，TCVS将要求你选择一个外部比较程序，WINMERGE和EXAMDIFF都是可用的，免费的，能够很好的适用于基于文本的源代码，如果你使用的是一种实验室的编程语言，你可以使用LVDIFF可视化的图表比较，CSDIFF被设计用于比较不同版本的WORD文档，META-DIFF可以基于文件类型使用不同的比较工具。www.yippeesoft.com

TortoiseCVS will launch the diff tool you have chosen and compare your local copy of the selected file with the version from the repository. For more sophisticated diff options (such as comparing to an older repository copy or comparing two older versions to each other), see File Revision History. TCVS将调用你定义的比较工具来比较你选择的文件的本地拷贝和CVS仓库中的版本。更多的比较选项（例如和仓库中一个旧版本比较，或者比较两个旧版本）参见文件版本历史

Making a Snapshot: CVS Tag…创建快照：CVS标签
Abstract

Make a snapshot of a project at a given point in time for later retrieval. 在指定点创建工程快照，方便日后的取回www.yippeesoft.com

To create a tag, select the desired files and/or folders to remove and right-click on them. Note: A tag is normally applied to a folder, usually the top folder of the sandbox. 创建一个标签，选择文件或者目录，右键，注意 一个标签通常应用于文件夹，一般都是沙盒的顶层文件夹

Select CVS → Tag from the context-menu. 选择 CVS－标签 菜单

Enter the desired tag name. Note that CVS places some constraints on the tag name; these constraints are shown at the bottom of the dialog. To see which tags are already used in this folder, click the Update list… button. 输入标签名称，注意CVS对标签名称有一些约束，这些约束都显示在对话框的最底部，如果想看到哪些标签已经使用于这个文件夹，点击 更新列表 按钮

By default, the Check that the files are unmodified checkbox is enabled. This prevents you from applying the tag if you have uncommitted changes. Under special circumstances, you might want to disable this. 默认的，检测文件是否被更改的选择框是被勾选的，这是防止你有未提交的修改而应用标签，在特殊情况下，你可以去掉这个勾选

If the tag already exists, CVS will not move it unless you select Move existing tag. 如果标签已经存在，CVS不会主动移除，除非你选择 移除已经存在地标签www.yippeesoft.com

To remove a tag which you applied by mistake, or no longer want, select Delete existing tag. 移除标签：错误的标签，或不再需要的，选择 删除已经存在地标签

Finally, click OK. 最后，点击确定

Lines of Development: CVS Branch…开发线：CVS分支
Abstractwww.yippeesoft.com

Create a branch (aka fork) for a separate line of development. 为开发阶段分隔创建分支

To create a branch, select the desired files and/or folders to remove and right-click on them. Note: A branch is normally created on an entire folder, usually the top folder of the sandbox. 创建一个分支，选择文件夹或者文件，右键，注意：一个分支默认是整个文件夹，一般是顶层文件夹

Select CVS → Branch from the context-menu. 选择 CVS－－分支

Enter the desired branch name. Note that CVS places some constraints on the branch name; these constraints are shown at the bottom of the dialog. To see which branches are already used in this folder, click the Update list… button. 输入分支名称，注意名称限制，查看已经使用的分支，点击更新列表 按钮

By default, the Check that the files are unmodified checkbox is enabled. This prevents you from creating the branch if you have uncommitted changes. Under special circumstances, you might want to disable this. 默认的，检测文件是否被更改的选择框是被勾选的，这是防止你有未提交的修改而应用分支，在特殊情况下，你可以去掉这个勾选www.yippeesoft.com

If the branch already exists, CVS will not move it unless you select Move existing branch. 如果分支已经存在，CVS不会主动移除，除非你选择 移除已经存在的分支

To remove a branch which you created by mistake, or no longer want, select Delete existing branch. You should be very careful when doing this. 移除一个你错误创建或者不再需要的分支，选择 删除已有分支，你应该谨慎小心的处理这个工作

Finally, click OK. 最后，点击 确定 按钮www.yippeesoft.com

Note that your sandbox is not automatically changed so that you are working on the newly created branch. To do this, see Selecting a Branch to Work On.注意，你的沙盒不是自动改变的，因此你目前需要工作于最新创建的分支，参见：选择分支进行工作

Making Your Changes Available to Others: CVS Commit…www.yippeesoft.com

Abstract
Update the CVS repository with your local changes.
To commit changes either right-click on the desired folder and/or files.
Select CVS Commit… from the context-menu.
The Commit Dialog will appear, which will allow you to enter a comment for the commit action. Additionally, you can choose which changes to commit by checking the individual files on the dialog list.
Click OK (or press Ctrl-Enter) once you have entered the appropriate comments and selected the changes to commit.
The Progress Dialog will appear to provide a detail status of the committing process performed by TortoiseCVS. By default this dialog will close after the operation is complete, unless it encounters a problem.
让你的修改对他人生效: CVS 提交..

Abstract
让CVS仓库更新你的修改.
在修改的文件要提交的文件上点击右键.
关联菜单上选择CVS提交.
Commit Dialog 提交对话框，输入修改的注释说明，你还可以在对话框的文件列表中再次选择要提交的文件
当你选择好文件，输入好说明后点击确定 www.yippeesoft.com
Progress Dialog 进度对话框弹出，说明进度情况，默认无错状态下自动关闭.

Adding New Files: CVS Add and CVS Add Contents…

Abstract
Add local files and/or folders to the CVS repository.
To add files or folders to the CVS select and right-click the files or folders you wish to add. These files must have the CVS Status of Not In CVS.
If you have selected a folder you will be provided the option to Add Recursively in the context-menu. This option will add all files in the selected folder and its sub-folders. Otherwise, to only add those files and folders selected select Add from the context-menu.
The Progress Dialog will appear to provide a detail status of the adding process performed by TortoiseCVS. By default this dialog will close after the operation is complete, unless it encounters a problem. www.yippeesoft.com
增加新文件: CVS 新增和新增所有…

Abstract
增加本地文件或者文件夹到CVS仓库中.
选择文件或者文件夹，右键. 这些文件必须是非CVS控制中的状态.
如果选择文件夹，点击 新增所有菜单，它将增加所有该目录以及子目录下的所有文件 如果只是增加当前的文件和文件夹，那么选择 新增 菜单.
Progress Dialog 进度对话框默认自动关闭. www.yippeesoft.com

Discarding Obsolete Files: CVS Remove

Abstract
Remove a file from the current branch. The file will still be available when retrieving an older revision or tag.
To remove one or more files from the CVS repository select the desired files and/or folders to remove and right-click on them.
Select CVS → Remove from the context-menu. TortoiseCVS performs the removal and shows a Tortoise Tip that reminds you that you must commit the removal to finish the process.
Finally, invoke the CVS Commit command on the folder (or a parent folder).
When another user now performs an Update, CVS will remove the file(s) from the sandbox.
移除旧文件: CVS 移除

Abstractwww.yippeesoft.com
从当前分支移除文件. 这些文件还是可以通过旧版本或者分支重新获得.
选择要移除的文件，右键.
选择 CVS－移除菜单，TCVS将完成移除操作，并提示需要进行提交操作来生效.
最后，在本目录或者父目录上选择 提交 菜单.
如果此时有人正在进行更新操作，CVS将从他的沙盒中移除文件.

TortoiseCVS 用户手册www.yippeesoft.com
版本 1.8.0
Ben Campbell
Martin Crawford
Hartmut Honisch
Francis Irving
Torsten Martinsen
Ian Dees
Copyright ? 2001 – 2004 TortoiseCVS

Table of Contents
1. 基本介绍www.yippeesoft.com
CVS简介
TortoiseCVS简介
从何开始
2. TortoiseCVS快速入门
沙盒
取出模块
Windows Explorer 和 TortoiseCVS
Total Commander  和 TortoiseCVS
更新你的沙盒
提交你的修改到仓库
解决冲突
新增文件或目录到仓库www.yippeesoft.com
3. TortoiseCVS使用说明
创建一个新的仓库或模块
监视, 编辑、撤销
标注和标签
恢复旧版本文件
分支和合并
创建分支
选择分支工作
从分支合并
回到主分支
二进制和UNICODE检测
文件修改历史
历史对话框
版本分支图
Web日志
制作补丁文件
4. TortoiseCVS定制
重叠图标
选择不同的图标
修改中图标工作
5. TortoiseCVS命令参考
TortoiseCVS安装
获得工作拷贝: CVS 取出…
获得其他人的修改: CVS 更新
CVS 更新到指定版本…
使你的修改对别人生效: CVS 提交…
新增文件: CVS 添加 和 CVS 添加所有…
丢弃旧文件: CVS 移除
找出修改差异: CVS 比较…
标记快照: CVS 标签…
开发线: CVS 分支…
CVS 合并…
CVS 创建新模块
监视和锁定
找出错误原因: CVS 注释
显示肯定信息: CVS 资源管理器列头
键盘快捷键
WEB日志如何自动检测服务器网址
6. TortoiseCVS对话框参考
新增对话框
取出对话框
更新到指定版本对话框
提交对话框
分支对话框
创建新模块对话框
进度对话框
标签对话框
属性对话框
合并对话框
历史对话框
版本分支图对话框
关于对话框
7. 条款, 提示和窍门
用TortoiseCVS访问SourceForge
CVS和VSS的区别
为TortoiseCVS创建新图标
为TortoiseCVS创建（翻译）本地化
使用PuTTY
使用Pageant免除每次输入SSH密码
8. 资源
List of Figures
2.1. 取出对话框
2.2. TortoiseCVS和Windows Explorer
2.3. 更新文件和目录
2.4. 提交对话框
2.5. 解决冲突对话框
2.6. 新增对话框
2.7. 新增所有内容对话框
3.1. 创建新模块对话框
3.2. 创建新仓库的问题
3.3. 标签对话框
3.4. 分支对话框
3.5. 更新到指定版本对话框
3.6. 合并对话框www.yippeesoft.com
3.7. 历史对话框
3.8. 版本分支图对话框
3.9. Web日志对话框
5.1. 注释对话框
5.2. 选择显示列头
6.1. 新增对话框
6.2. 取出对话框- 模块标签页
6.3. 取出对话框 – 版本标签页
6.4. 取出对话框 – 选项标签页
6.5. 更新到指定版本对话框
6.6. 提交对话框
6.7. 进度对话框
6.8. 标签对话框
6.9. 属性对话框 – 主要选项
6.10. 属性对话框 – 策略
6.11. 属性对话框- 工具
6.12. 属性对话框 – 高级www.yippeesoft.com
6.13. 属性对话框 – 外观
6.14. 属性对话框 – 缓存
6.15. 属性对话框 – 忽略文件
6.16. 属性对话框 – 图标选择
6.17. 历史对话框www.yippeesoft.com
6.18. 版本分支图对话框
6.19. 关于对话框
List of Tables
2.1. 重叠图标
2.2. 右键关联

Using TortoiseCVS with SourceForge TCVS使用手册
TortoiseCVS Client Installation Instructions 安装指南
This document provides instructions for installing and using the TortoiseCVS CVS client software. These instructions are designed for SourceForge.net project developers who are using 32-bit Microsoft Windows platform. It is for developers who would like to work with the source code for a project which is hosted on SourceForge.net. For background information you may like to read the other available documents about CVS. 安装使用指南。为SF.NET开发者准备，工作于WIN21平台。工作于SF.NET项目源码。你应该学习一些关于CVS的知识背景。

TortoiseCVS has advantages over WinCVS for work on SourceForge. It has a clearer interface which is integrated into Windows Explorer. WinCVS has a more complex and mature interface. For more obscure commands it may be easier or necessary to use WinCVS. TCVS比WINCVS优势。简洁集成于资源管理器，WINCVS有一个更综合成熟的界面。更简单或者必需的WINCVS使用需要更多的命令行知识。

A particular benefit is that TortoiseCVS has an SSH client built into it, without special setup. Anyone can easily commit code to SourceForge.net projects using TortoiseCVS. 还有一点是TCVS内建SSH客户端。不需要另行安装。任何人都可以用TCVS方便的提交代码到SF。

Installing TortoiseCVS 安装
Go to http://tortoisecvs.org/ and download the Download page. 访问网站从下载页面下载。

To install, run the executable and follow the instructions. 按照下列指示运行安装程序

Since TortoiseCVS is a shell extension, you need to reboot your machine. 由于是一个外壳扩展，所以需要重启

Checking out an existing project 取出一个已经存在的项目www.yippeesoft.com
If you are working on an existing project first you now need to check out the code. 如果你第一次工作于一个已经存在地项目，你应该取出源码

Make sure you have made an account on SourceForge.net, and that you have been added as a developer to the project you are going to work on. A project administrator needs to do this. 首先确认你有一个帐号，你已经成为项目的开发组一员，项目管理员处理

In Windows Explorer go to the folder that you would like to check the code out into. 到资源管理器中你想要放置源码的目录www.yippeesoft.com

Right click and from the context menu choose the command CVS Checkout…; it\’s next to the Tortoise icon. 右键关联菜单选择取出，TCVS图标

You will need your user name on SourceForge.net, and the project UNIX name. Fill in the dialog as follows: 你需要你的用户名、项目的UNIX名称。填充对话框 Protocol: Secure Shell (:ext) 安全协议 Server: cvs.sourceforge.net  服务器 Directory: /cvsroot/projectname  目录 Username: sername 用户名
Click Fetch List to get a choice of modules. You will need to enter your password in the dialog at this point. Then pick the module that you would like. 点击列表按钮，获得选择模块，你需要输入密码，选择你需要的模块www.yippeesoft.com

Choose OK.TortoiseCVS will now check out the code. You will need to enter your password. 确定，TCVS将取出源码，你需要输入密码

You can now alter files and then select CVS Commit on the top level folder to make your changes in the repository. For more information read the TortoiseCVS User\’s Guide. 你现在可以进行修改，在顶层目录进行提交使修改在仓库中生效。更多信息见手册www.yippeesoft.com

Get an error? 出现错误If you get an error saying something like Could not chdir to home folder /home/users/r/rd/rdonkin: No such file or folder then you need to log into the server with SSH to force creation of your home folder. Do this by connecting to username@cvs.sf.net either with Putty or a command line SSH. 如果出现错误，如说什么不能进入主目录；没有该文件或者文件夹，那么你要通过SSH登录服务器，创建HOME目录，通过使用PUTTY或者SSH命令行连接

Working on a new project 工作一个新项目If you are working on a new project then you first need to create a new module in the repository. 如果是新项目，你首先创建一个新的模块

Create a folder with the name you would like the module to have. 创建一个文件夹以模块命名

Put the files you would like to add in the folder. www.yippeesoft.com把文件拷贝到这里

Right click on the folder, and choose Make New Module from the CVS submenu. 右键，新模块

Fill in the dialog as described in the previous section. Note that the module name is filled in for you. 按照上一章说的填充对话框。自己输入模块名称www.yippeesoft.com

Choose OK. You will need to enter your password twice, and the module will be made for you.确定，输入密码，模块创建 www.yippeesoft.com

Proceed to add files and folders by right clicking on them and choosing CVS Add or CVS Add All Recursively from the context menu. 增加文件：右键 选择 增加；增加所有递归 For more information read the TortoiseCVS Daily User\’s Guide 读用户手册

Tired of entering your password all the time?始终输入密码
You need to make a public/private key pair. The public key goes on the server, and the private key sits on your hard drive. Now, when you connect the server can verify who you are because only you have your private key. 你需要制作一对公钥私钥，公钥在服务器，私钥在本地硬盘，现在你连接服务器可以校验你的身份，www.yippeesoft.com因为你有了私钥

To further protect your private key it is encrypted on your hard disk with a passphrase. You can however choose an empty passphrase, in which case you never have to enter a password but anyone with access to your computer can access your SSH CVS account. Or you can use an SSH Agent (such as Pageant) which will remember your passphrase for the duration of one session, so you only have to enter it once. 为了更好的保护私钥，密码加密了的，你可以选择一个空的密钥，这样你就不用每次输入密码，但是任何可以访问你电脑的人也可以访问你的SSH CVS帐号。或者你可以使用SSH代理，www.yippeesoft.com它可以在一个SESSION中记住你的密码，因此你只要输入一次。

TortoiseCVS uses a version of Plink as its SSH client. This means you can use PuTTYgen to make a public/private key pair, and you can use Pageant to point to where the private key is. First of all download them both from the PuTTY web site. TCVS使用一个版本的PLINK作为它的SSH客户端，意味着可以使用PUTTYGEN制作公钥私钥对，你可以使用 指向你的私钥。www.yippeesoft.com可以从网站下载

For information on how to use them read the PuTTY documentation on PuTTYgen and Pageant. In particular, make sure you read the sections "8.2: Using PuTTYgen, the PuTTY key generator" and "9.3.1 Making Pageant automatically load keys on startup". 如何使用看PUTTY文档，特别注意这章 8.2 使用 9.3.1 www.yippeesoft.com

After making your public key with PuTTYgen you need to upload it using the SourceForge.net web interface. Log into the SourceForge web site, and go to your Account Preferences page. Down at the bottom is a section "Shell Account Information" with an entry "CVS/SSH Shared Authorized Keys". You need to add your public key there. 生成公钥后上传到SF.NET，登录站点，进入你的帐户参数，点击 帐号信息 CVS/SSH共享授权密钥 项目，在这里加入公钥www.yippeesoft.com

Obtaining a Working Copy: CVS Checkout… 获得工作拷贝：CVS取出Abstract概要

Creates a local sandbox from a CVS repository. 从CVS仓库创建一个本地沙盒

Create a folder for the sandbox in Windows Explorer. 在资源管理器中为沙盒建立文件夹

Right-click on the folder. 右键文件夹

Select CVS Checkout… from the context-menu. 从关联菜单选择 CVS取出

The Checkout Dialog will appear. From here you can either enter the repository\’s CVSROOT into the CVSROOT field, or construct a CVSROOT using the Protocol, Server, Port, Repository name, and User name fields. 取出对话框将弹出，在这里你可以直接输入仓库的CVSROOT连接字符串；也可以填写协议、服务器、端口、仓库名称和用户名密码自行创建。

If you know the module name you can enter it in the Module field. Conversely, you can checkout an entire repository by entering a period (.) into the Module field. If you do not know the module name you can click on Fetch list to populate the drop-down with available modules. Note: Some CVS servers do not support this feature; if you cannot populate this list you should contact the CVS server administrator. 如果你知道模块的名称，那么请输入文本框，相反的，你可以取出整个仓库，输入 . ，如果你不知道模块名称，你可以点击 取出列表 按钮，它将在下拉框中填充有效的模块名称，注意：有些CVS服务器不支持这个功能，如果你不能填充这个列表，你应该联系CVS服务管理员。

Click OK to being checking out the sandbox. 点击确认按钮将开始取出沙盒。

Depending on the protocol and if this is the first time checking out from this CVS repository, you will be prompted to enter a password. Enter the password in the dialog and click OK. 由于协议规定，首次从CVS仓库中取出你将被提示输入密码，在密码框中输入并点击确定。

The Progress Dialog will appear, which provides a detail status of what files are being checked out by TortoiseCVS. By default this dialog will close after the operation is complete, unless it encounters a problem. 进度对话框弹出，它提供TCVS怎么取出模块的详细状态信息。默认情况下这个对话框在操作完成后自动关闭，除非期间有错误。

Getting Other People\’s Changes: CVS Update 获得别人的修改 更新Abstract

Synchronizes a local sandbox with a CVS repository. See also Update Special. 和CVS仓库同步本地沙盒，参见 更新

To update a folder either right-click on it or within it on the Explorer view (but not on any specific files) or to update one or more files select the files to update and right-click on them. 更新一个文件夹：右键它；在资源管理器中（不是在某些特别的文件上）或者只是更新某个或某些选择的文件，右键点击 Select CVS Update from the context-menu. 选择CVS更新菜单

The Progress Dialog will appear to provide a detail status of the files that are being updated by TortoiseCVS. By default this dialog will close after the operation is complete, unless it encounters a problem. 状态对话框，默认自动关闭。

CVS Update Special…更新到指定版本 Abstract Synchronizes a local sandbox with a CVS repository. See also Update. 同步本地沙盒www.yippeesoft.com

To update a folder either right-click on it or within it on the Explorer view (but not on any specific files) or to update one or more files select the files to update and right-click on them.

Select CVS → CVS Update Special… from the context-menu. 更新到指定版本

The Update Special Dialog will appear. Enter into the textbox labeled Get tag/revision/branch: either the Revision number (i.e. 1.3), Tag (i.e. release_1_1_0), or Branch (i.e. vendorx_branch) to change your sandbox copy to. 对话框弹出，输入文本框 标签、版本、分支。更新

The Progress Dialog will appear to provide a detail status of the files that are being updated by TortoiseCVS. By default this dialog will close after the operation is complete, unless it encounters a problem. 默认自动关闭。www.yippeesoft.com

Chapter 4. Customizing TortoiseCVS 第四章 定制TCVS Table of Contents www.yippeesoft.com

Overlay Icons 重叠图标 Selecting a Different Set of Overlay Icons 选择不同设置的重叠图标
Changing how the Overlay Icons Work 重叠图标如何工作 Overlay Icons
Selecting a Different Set of Overlay Icons 选择不同的重叠图标
TortoiseCVS comes with several sets of overlay icons. You might prefer one of the alternative icon sets to the default one; open the Preferences Dialog – Iconset Chooser Iconset Chooser dialog to select another icon set. Regrettably, Explorer caches the overlay icons, which means that you have to restart Windows to see the effect of the change. The dialog shows a preview of the icons to help you choose the correct one. TCVS附带几个不同的重叠图标设置，你可以在其中选择一种设置为默认图标。打开属性对话框－图标选择，图标选择对话框中选择一种图标。但是遗憾的是，资源管理器缓存了重叠图标，所以你不得不重新启动WINDOWS来查看修改效果。对话框将显示图标效果帮助你进行选择。www.yippeesoft.com

Changing how the Overlay Icons Work
By default, the overlay icon for a folder will indicate "modified" if any of the files in the folder are modified. It is possible to configure TortoiseCVS to indicate "modified" if any of the files in the folder or in any subfolders are modified. 默认的，一个文件夹的重叠图标，如果该文件夹下有文件被修改，图标指示 修改。也可以设置TCVS在该文件夹或者任意子文件夹下有文件被修改时进行指示。

As updating this status can easily be resource-intensive, TortoiseCVS offers the possibility of either updating the status each time you open the folder, or only on demand. In the latter case, the icons will show the cached status, and you will have to invoke CVS → Refresh Folder Status to update the status. 如同更新这种状态很容易耗用资源，TCVS提供可能，每次你打开文件夹的时候更新状态，或者只是在有需要的时候，在后一种情况，图标将显示的是缓存中的状态，因此你不得不调用 CVS－刷新文件夹状态来更新状态。www.yippeesoft.com

Go to Preferences Dialog – Advanced Tab and change the Folder icon overlays setting as you desire. 进入熟悉对话框－高级标签页，如你所愿修改文件夹图标重叠设置。www.yippeesoft.com

SHENGFANG：你可以在创建一个新的图标目录，并在注册表中同样增加，然后用图标编辑器修改图标。之所以新建，因为可能版本更新会覆盖原有图标。www.yippeesoft.com

This chapter is written to illustrate most main features and functionality of TortoiseCVS. It assumes that a) you already have an understanding of CVS and b) you have access to an already installed a CVS server with created a CVS repository. If you are new to CVS then please refer to the section "TortoiseCVS for Beginners." 本章用于说明TCVS的主要特色和功能，基于如下假设：你已经对CVS有一定了解，你已经存取一个已经安装了的并且创建了一个仓库的CVS服务器，如果你还不了解CVS，请查阅如下章节 TCVS入门

Installing TortoiseCVS 安装TCVS
Download the latest version of TortoiseCVS from the web site (http://tortoisecvs.org/) and save to a temporary location on your hard drive. 可以从网址下载最新版本的TCVS，保存到你的硬盘的本地临时目录

Run the installer. If you are running Windows NT or 2000 you must have local admin privileges to install TortoiseCVS correctly. 运行安装程序，如果你运行的系统是WINNT或者WIN2000，你必须有本地超级用户权限来进行安装www.yippeesoft.com

Choose the location for TortoiseCVS to be installed. The default is C:\\Program Files\\TortoiseCVS. 选择一个TCVS地安装目录，默认得是

Choose the installation type, either Full, Compact, or Custom installation. If you desire internationalisation support, you will need either the Full or Custom installation options. 选择安装类型，完成 简洁 定制 安装模式，如果你希望获得国际化支持，你应该选择完全或者定制安装选项。

Once the installer has completed you must reboot the computer for TortoiseCVS to finish its installation[3]. 当安装完成，你应该重新启动计算机让TCVS完成整个安装过程——————————————————————————–

[3] Strictly speaking, it is only necessary to restart Windows Explorer. If you are feeling adventurous, you can try killing explorer.exe from Task Manager. In some cases Windows? will automatically start a new Explorer instance, in other cases you will have to do it yourself. 严格的来说，只是需要重新启动WINDOWS资源管理器，如果你勇于冒险，你可以尝试杀掉资源管理器进程于任务管理器中，有时候WINDOWS将自动启动一个新的资源管理器实例，有时候你不得不自己运行一个。www.yippeesoft.com

SHENGFANG：你可以注销而已

Web Log WEB日志
Web Log offers much of the same functionality as the History and Revision Graph dialogs. One important difference is that Web Log is not part of TortoiseCVS itself, but depends on special software that may be installed on the CVS server you use. Two popular packages for providing Web Log functionality are ViewCVS and CVSweb — ask your CVS administrator if one of these is available. WEB日志提供如同历史和版本图类似的大部分功能，一个重要的不同是WEB日志不是TCVS本身的一部分，而是依赖于特定的软件，一般都是安装在CVS服务器上的，两个流行的提供WEB日志的软件包 VIEWCVS和CVSWEB－请询问网管使用的是www.yippeesoft.com哪一个。

To view the Web Log, you open a special URL using a web browser. TortoiseCVS knows the most common URLs in use for this and can in most cases detect the correct one automatically[2]. If your configuration is nonstandard, you may have to enter the URL manually the first time – next time TortoiseCVS will remember it. 查看WEB日志，你应该使用一个浏览器打开一个特定的网址，TCVS默认检测比较通用的网址，并且自动检测正确的网址。如果你的配置不是标准的，你应该在首次使用的时候手工输入一个网址，TCVS下次将会记住它。www.yippeesoft.com

You can view Web Log for a file or folder by selecting it and right-clicking CVS → Web Log. If TortoiseCVS fails to detect the URL, the dialog below will appear. 你可以查看文件或者目录的WEB日志，选择－右键－CVS－WEB日志。如果TCVS检测失败，www.yippeesoft.com将出现如下对话框。Figure 3.9. Web Log Dialog

Enter the correct URL and click OK. If the URL of the Web Log server has changed, you may have to tell TortoiseCVS to perform the automatic scan again. 输入正确的网址再点击确定。如果WEB日志的服务器网址被动，你应该设置TCVS再次自动检测——————————————————————————-

[2] For details about the automatic URL detection, see How Web Log Autodetects the Server URL. 自动网址检测的更多信息请参见 WEB日志如何自动检测服务器网址www.yippeesoft.com

Making a Patch File 作个补丁程序
Often you might have read access to a CVS repository or module, but not write access. Open source projects typically work this way to maintain quality control for all contributions to a project. The easiest and most reliable way to contribute changes to these projects is by creating a Patch File to submit to them. 很多时候你可能只有CVS仓库的读权限而没有写权限。开源项目就是典型的这种工作方式，这种方法可以保证一个项目的质量控制，最简单而且最可靠的提交修改的办法是创建一个补丁文件并提交。www.yippeesoft.com

In TortoiseCVS this is done by selecting the folders or files with changes that you wish to include in the patch file. Right-click on your selections and choose CVS → Make Patch… from the context menu. You will then be prompted with a Save dialog to indicate where to save your patch file. Finally, TortoiseCVS will open the new patch file in Notepad, where you can validate your changes. 在TCVS，首先选择你想要包含在补丁文件中的做了修改的文件或者目录。右键，选择CVS-制作补丁。你将看到一个保存对话框并且提示你把文件保存到哪里。最后TCVS将在记事本中打开一个补丁文件，你可以验证你的修改www.yippeesoft.com

Sometimes your contribution involves adding new files, which are not yet in CVS. TortoiseCVS cannot guess that you would like these to be included in the patch, but in the Save dialog you can click the Browse button to bring up the Add dialog. Here you can select files to be included in the patch. www.yippeesoft.com有时候你想提交一个不存在于CVS中的新文件，TCVS不能猜测到哪个是你想要增加到补丁文件的，在保存对话框你点击 浏览 按钮，弹出一个新增对话框，在这里你可以选择你想要加入补丁文件的文件。

Binary and Unicode Detection 二进制和UNICODE检测
TortoiseCVS tries to automatically detect the type of file you are adding to CVS. It can detect whether the file is Text/ASCII, Text/Unicode, or Binary. TortoiseCVS first checks the file extension to determine whether the file is Binary or Text. For example .doc and .exe, are always assumed to be Binary while other extensions, such as .cpp and .txt, are always assumed to be text. TortoiseCVS does this using a built-in list of Binary and Text extensions which includes most the common file extensions. To customize this list, you can copy the file TortoiseCVS.FileTypes from the TortoiseCVS installation directory to your HOME directory and edit it for your needs. TCVS尝试自动检测你加入CVS的文件类型。它能够检测文件是文本ASCII，文本UNICODE，或者BIN二进制文件，TCVS首先检查文件的扩展名来判断是二进制还是文本。例如DOC和EXE，通常被认为是二进制文件，www.yippeesoft.com其他扩展名，例如CPP、TXT，通常认为是文本文件。TCVS使用的内建的二进制或者文本扩展名的列表，包含了大多数常见的文件扩展名。如果需要定制这个列表，你可以复制文件 TORTOISECVS.FILETYPES 从 TCVS 的安装目录到你的 HOME 目录，并根据你的修养修改。

By default TortoiseCVS will also examine the first 4000 bytes of a file to determine the type. This is used in cases where the file extension is not known. These first few bytes are also used to determine whether the file is Text/ASCII or Text/Unicode. TCVS在文件扩展名不不能确定的情况下，将检查文件的前4000BYTE来确定类型。这些BYTE还能够用于检测文件是ASCII 文本还是UNICODE文本。

TortoiseCVS also provides a sophisticated plugin mechanisim that you can implement a DLL to perform the file type detection. The details of this plugin interface is also available in the FileTypes.config. TCVS还提供了一个成熟的插件机制，你可以实现一个DLL来完成文件类型检测。插件接口的详细信息FileTypes.config.

In all cases, the Add Dialog presents the files you are about to add their file types, so that you have a chance to correct the choices made. 在所有情况下，增加文件对话框显示你增加的文件的文件类型，因此你可以有机会校正。

File Revision History 文件版本历史记录www.yippeesoft.com
TortoiseCVS provides two methods of reviewing and working with the history of a file. The first is via the History Dialog. TCVS提供两种方法查看和处理文件的历史记录，第一个称为 历史对话框

History Dialog历史对话框
You can view a file\’s history by selecting it and right-clicking CVS → History. 选择一个文件右键点击 CVS－历史，你可以查看文件的历史Figure 3.7. History Dialog

The History Dialog will show a log of the revisions, tags, and branches for the selected file. It will also offer you the opportunity, by right-clicking on a specific revision, tag, or branch, to diff, save the revision locally, or update with sticky tags (an advanced CVS concept; usually, the save option is preferable to a sticky update). You can also edit any current or previous commit message by clicking on a revision and typing into the text area at the bottom of the window (remember to click Apply before moving to a new revision). 历史对话框显示文件版本、标签、分支等记录，你还可以右键选择特定的条目进行比较，www.yippeesoft.com另存或者附着标签更新，一个高级的CVS概念，通常保存比附着更新更好。你还可以修改任意一次的提交信息，选择一个版本，在窗体最下方文本框输入新的信息，记得点击应用按钮进行保存。这样你选择另外一个新版本的时候信息不会丢失。

Revision Graph Dialog版本图对话框
TortoiseCVS also provides a Revision Graph Dialog to graphically show you the history of a file. You can view a file\’s revision graph by selecting it and right-clicking CVS → Revision Graph.TCVS还提供了一个版本图对话框，显示文件的所有历史。选择文件，右键，CVS－版本分支图。Figure 3.8. Revision Graph Dialog

Like the History Dialog, the Revision Graph Dialog will allow you to see the details for and perform CVS operations on any revision, tag, or branch. www.yippeesoft.com如同历史对话框，版本分支图显示文件的详细信息以及让你进行CVS操作。

If your CVS server runs CVSNT, you will also be able to see which merge operations have been performed on the file: A purple arrow is drawn from the source revision to the destination revision (see Mergepoints). 如果你的CVS服务器端是CVSNT，你还将能够看到文件的合并操作，一个紫色的箭头从源版本指向目的版本，参见 合并点。www.yippeesoft.com

Merging from a Branch合并分支www.yippeesoft.com
When you are satisfied with the changes you have done on a branch, you may want those changes to be available on the head branch of development. Incorporating changes from one branch to another, is known as merging. 如果你觉得在一个分支上的修改觉得满意，你会想把这些修改合并到主开发分支上去。从一个分支合并到另外一个分支称之为合并。www.yippeesoft.com

To merge from a branch, move your local copy to the branch you want to merge the changes into. See Selecting a Branch to Work On or Going Back to the Head Branch. Select the top level folder of the project. You can also select the exact folders and files that are part of the desired branch if you know this information. Right-click the on the selection, and choose CVS → Merge…. 从一个分支合并，移动你的本地拷贝到你想最终合并的分支上去，参考 选择一个工作分支或者回到主分支。选择项目的的顶层目录，如果你能够确认得话，你也可以选择准确的文件和目录，分支的一部分而不是全部。右键 点击，选择 CVS－合并 Figure 3.6. Merge Dialog 合并对话框www.yippeesoft.com
You will then be presented with the Merge Dialog. Here you can enter the branch name in the Branch to merge from field you wish to merge. Click the OK button, and TortoiseCVS will now merged the branch specified into your local copy. Your changes will not be made on the server repository, until you commit your changes. 合并对话框将弹出，输入分支名称于 从何合并文本框（你想要合并得），点击确定，TCVS将合并该分支到你的本地拷贝中。你的修改不会在仓库生效，需要你进行提交操作。www.yippeesoft.com

The merge given above will try to merge changes from the start of the branch. If you do the operation a second time (to merge changes done to the branch after the last merge), merging from the start of the branch is not what you want, and it will most likely get you into trouble. To get around this problem, you should give the branch a new tag after every merge, and use the new tag when naming the branch for subsequent merges. 上述合并将从最开始的分支开始合并，如果你第二次进行合并（从最后合并后的分支再合并修改），你不希望从开始分支开始合并，这将带给你麻烦。处理这个问题，你应该在每次合并后给分支打上一个标签，使用新的标签命名后来修改的分支。www.yippeesoft.com

Note: The above paragraph only applies for standard Unix CVS (aka cvshome.org CVS). If your server runs CVSNT, you can take advantage of a special feature known as merge points. This means that CVS keeps track of your last merge, so that you can effortlessly merge from the same branch repeatedly. For more information on this feature, see the CVSNT Wiki page (note that the CVSNT Manual is not yet up to date on this point). 注意：以上段落仅仅应用于UNIX CVS（CVSHOME.ORG cvs），如果你的服务器端运行CVSNT，你可以利用它的特点作为合并点。这意味着CVS保留你最后一次合并的踪迹，因此你可以从同一个分支进行多次合并。获得更多信息：参考CVSNT的WIKI页面。注意最近的CVSNT手册还没有注明这点。www.yippeesoft.com

Going Back to the Head Branch回到主分支
If you want to stop working on a branch and move your local copy back to the main line of development, you have to make TortoiseCVS remove all sticky tags. 如果你不想再在分支上工作而是把你的本地拷贝回到主开发线上，www.yippeesoft.com你必须让TCVS清楚所有粘性附着标签。

To remove the sticky tags, and thus update your local copy to the main development line, select the top level folder of the project. You can also select the exact folders and files that are part of the desired branch if you know this information. Right-click the on the selection, and choose CVS → Update Special…. 移除附着标签，www.yippeesoft.com从而让你的本地拷贝回到主开发线。选择顶层目录或者需要的文件，右键，CVS－更新到指定版本。

You will then be presented with the Update Special Dialog. Select the Return to main (HEAD) branch checkbox and click the OK button. TortoiseCVS will now do the necessary updates to move your working copy back to the head branch.www.yippeesoft.com 对话框弹出，选择 回到主分支 选择框，点击OK，TCVS将进行必要的更新让你的工作回到主分支