Finding Out What Has Changed: CVS Diff...找出修改内容:CVS差异 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.shengfang.org 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.shengfang.org 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标签 Make a snapshot of a project at a given point in time for later retrieval. 在指定点创建工程快照,方便日后的取回www.shengfang.org 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.shengfang.org 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分支 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.shengfang.org 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.shengfang.org 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.注意,你的沙盒不是自动改变的,因此你目前需要工作于最新创建的分支,参见:选择分支进行工作 字体:大 中 小 |
![]() | 永久地址 http://www.shengfang.org/blog/p/TortoisecvsCmdRef2.php |
![]() | 引用地址 http://www.shengfang.org/blog/tb.php?tb_id=1121650340 |
2005年7月18日09:32星期一 [English]





