首页 Soft PlugIn RAN乱 Dev开发 Info资料 English WAP 留言 登陆 注册
-
Posted by Yippee | 评论(0) | 引用(0) | 阅读1342次
TortoiseCVS User's Guide翻译-沙盒

Sandboxes 沙盒
CVS has a unique method of working from most other version control systems in that developers can edit the same files concurrently. First you Checkout a version of the source code from the repository into a local copy on your computer. This local copy is called a sandbox.

CVS与其他大多数版本控制系统与众不同的地方在于它允许开发者同时编辑同一个文件,首先你应该从仓库取出一份源码拷贝到你的本地计算机www.shengfang.org,这份本地拷贝称之为沙盒。

You then simply edit the files that you want to change. You can Add new files or remove files you no longer require. When you're done you Commit the changes to the repository.

然后你仅仅修改你想要修改的部分,你可以添加新文件或者移除一些你已经不再需要的文件,当你整理完后你应该提交你的这些修改到CVS仓库中去。

If someone else has changed the same file while you were working on it, then the commit will fail. You must then Update all your source code files from the repository. This will automatically merge the other developers changes into your copy of the file.

当你编辑修改一份文件的时候,如果有人已经对这份文件做了修改,那么你的提交将会失败,你必须重新从CVS仓库中更新所有你的源代码,CVS将自动合并其他用户的修改到你的本地拷贝文件中。www.shengfang.org

Sometimes CVS cannot do this automatically, for example if you both changed the same line of code. This is called a Conflict. Conflicts happen much less often than you might expect. CVS puts both versions of the conflicting code in the file, with markings separating them. Then you manually edit the file to resolve the conflict before you can commit the changes.

有时候CVS将无法自动完成这个操作,例如,如果你们修改的是同一行代码,我们称之为冲突,你大可不必过于担忧,冲突出现的次数将大大少于你的预期,CVS将把版本的冲突代码合并在一起,通过标志进行分隔,你应该手工编辑文件,解决冲突的地方,然后再提交这些修改。www.shengfang.org

This method of working has lots of advantages. Each developer lives in a sandbox. Changes that another developer makes are isolated from you until you want to check in your changes. It stops bottlenecks where people cannot do things because someone else has the file checked out. Any developer can work on files without direct access to the server, they only need to connect to update or commit.

这种工作方式有很大的优越性,每个开发员都工作于一个沙盒之中。其他开发员所作的修改与你无关,除非你提交你的修改的时候,这样我们就突破了一个瓶颈:如果有人将一个文件取出了,其他人将无法对这个文件作任何操作。每一个开发员不需要连接到服务器上直接存取文件,他们只需要在更新和提交的时候再连接服务器。

VSS这点就很讨厌,一个人CHECK OUT,文件就被锁定了,如果他只是更新而没有CHECK IN的话,那么这个文件别人永远动不了,还得一个一个找过去看是谁没有签入。


字体:

Permanant URI永久地址 http://www.shengfang.org/blog/p/tcvshlpSandboxes.php
Trackback URI引用地址 http://www.shengfang.org/blog/tb.php?tb_id=1120137122

2005年6月30日21:12星期四  [English] 追踪此文的RSS
提示:
此文还没有评论。

称呼:    登陆   注册
   不注册,但记住我的信息
邮件:
(非必须)
评论: [UBB代码帮助]
粗体 斜体 下划线 链接 水平线 引用



验证码: 请输入你看见的数字
关闭UBB      提交时自动将内容复制到剪贴板

公告
Fire and Motion!

统计信息
[Yippee]||[统计]||日志:1858
在线: 13||用户: 2577 [列表]
今日:402||到访:2886466
Rss:897745||评论:1605

最新日志

最新评论

友情链接

日历
2008 - 08
     12
3456789
10111213141516
17181920212223
24252627282930
31      

最新引用

搜索

归档

杂项
Get RSS Feed (Version 2.0)
Get Atom Feed (Version 0.3)
编码:  UTF-8