svn使用指南-liwei

1、All SubTrain materials are published under the Creative Commons Attribution License and contain material from other works published under the same license. To view a copy of this license, visit /licenses/by/2.0/ or send a letter to Creative Commons, 559 Nathan AbbottWay, Sta

2、nford, California 94305, USA. Special thanks to the authors of the comprehensive subversion book book “Version Control with Subversion” by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato. You are free to adjust the materials to your needs. Please respect our work by adding the SubTr

3、ain logo to your slides.Subversion轻松之旅工程师篇网站运营部 前端工程师 李伟Subtrain - SVN User Training Polarion Software 20072大纲大纲初级课程1 Subversion 简介2 典型工作流程3 沙盘演练其它常用操作5 好习惯，坏习惯Subtrain - SVN User Training Polarion Software 20073大纲大纲中级课程（团队协作）Part11 打标签 (Tagging) 沙盘演练1Part22 冲突 (Conflicts) 沙盘演练23 锁(Locking) 沙盘演练3Sub

4、train - SVN User Training Polarion Software 20074大纲大纲高级课程（团队协作II）1 团队工作模式2 分支(Branching)3 合并(Merging)4 典型案例5 沙盘演练 SVN初级课程Subtrain - SVN User Training Polarion Software 20076大纲大纲初级课程1 Subversion 简介2 典型工作流程3 沙盘演练 其它常用操作5 好习惯，坏习惯简介Subversion 历史Subversion 概览Subtrain - SVN User Training Polarion Software

5、 20078Subversion 定义定义Subversion 是一个开源的开源版本控制软件。Subversive activity is the lending of aid, comfort, and moral support to individuals, groups, or organizations that advocate the overthrow of incumbent governments by force and violence. All willful acts that are intended to be detrimental to the best i

6、nterests of the government and that do not fall into the categories of treason, sedition, sabotage, or espionage are placed in the category of subversive activity. Subtrain - SVN User Training Polarion Software 20079Subversion 历史历史June 2000 - Coding begins.August 2001 - Subversion becomes self-hosti

7、ng.2002 1st release 2004 Feb. Release 1.0.02006 Sept. Release 1.4.02007 Jan Release 1.4.4Estimated amount of Subversion developers: 1.4 millionSubtrain - SVN User Training Polarion Software 200710Subversion的用户和规模的用户和规模481 577 RevisionsTestimonial:Stuart Robertson of Absolute Systems, Inc (5 May 2004

8、)In the last 4 months we have migrated all of our internal product source repositories from XXX to SVN Our largest SVN repository is now 3.7GB and currently has 68806 revisions. We are running SVN 1.0.1 + Apache 2.0.48 on Linux. .SVN is a superb piece of work, and it is a *huge* step forward from XX

9、X. To put things in perspective. previously we had 26 XXX databases for one productMore testimonials on: /testimonials.htmlSource of information: /viewvc/Subtrain - SVN User Training Polarion Software 200711Subversion 概念概念Most current CVS features. Subv

10、ersion is meant to be a better CVS, so it has most of CVSs features. Generally, Subversions interface to a particular feature is similar to CVSs, except where theres a compelling reason to do otherwise.Directories, renames, and file meta-data are versioned. Lack of these features is one of the most

11、common complaints against CVS. Subversion versions not only file contents and file existence, but also directories, copies, and renames. It also allows arbitrary metadata (properties) to be versioned along with any file or directory, and provides a mechanism for versioning the execute permission fla

12、g on files. Commits are truly atomic. No part of a commit takes effect until the entire commit has succeeded. Revision numbers are per-commit, not per-file; log messages are attached to the revision, not stored redundantly as in CVS.Apache network server option, with WebDAV/DeltaV protocol. Subversi

13、on can use the HTTP-based WebDAV/DeltaV protocol for network communications, and the Apache web server to provide repository-side network service. This gives Subversion an advantage over CVS in interoperability, and provides various key features for free: authentication, path-based authorization, wi

14、re compression, and basic repository browsing. Standalone server option. Subversion also offers a standalone server option using a custom protocol (not everyone wants to run Apache 2.x). The standalone server can run as an inetd service, or in daemon mode, and offers basic authentication and authori

15、zation. It can also be tunnelled over ssh.Branching and tagging are cheap (constant time) operations There is no reason for these operations to be expensive, so they arent.Branches and tags are both implemented in terms of an underlying copy operation. A copy takes up a small, constant amount of spa

16、ce. Any copy is a tag; and if you start committing on a copy, then its a branch as well. (This does away with CVSs branch-point tagging, by removing the distinction that made branch-point tags necessary in the first place.)Natively client/server, layered library design Subversion is designed to be c

17、lient/server from the beginning; thus avoiding some of the maintenance problems which have plagued CVS. The code is structured as a set of modules with well-defined interfaces, designed to be called by other applications.Client/server protocol sends diffs in both directions The network protocol uses

18、 bandwidth efficiently by transmitting diffs in both directions whenever possible (CVS sends diffs from server to client, but not client to server).Costs are proportional to change size, not data size In general, the time required for a Subversion operation is proportional to the size of the changes

19、 resulting from that operation, not to the absolute size of the project in which the changes are taking place. This is a property of the Subversion repository model.Choice of database or plain-file repository implementations Repositories can be created with either an embedded database back-end (Berk

20、eleyDB) or with normal flat-file back-end, which uses a custom format.Versioning of symbolic links Unix users can place symbolic links under version control. The links are recreated in Unix working copies, but not in win32 working copies.Efficient handling of binary files Subversion is equally effic

21、ient on binary as on text files, because it uses a binary diffing algorithm to transmit and store successive revisions.Parseable output All output of the Subversion command-line client is carefully designed to be both human readable and automatically parseable; scriptability is a high priority. Loca

22、lized messages Subversion uses gettext() to display translated error, informational, and help messages, based on current locale settings.Subtrain - SVN User Training Polarion Software 200712SVN作用作用代码文档统一存放便于协作历史可回溯组件级版本控制通过标签建立基线通过分支支持并行开发Subtrain - SVN User Training Polarion Software 200713SVN优势优势开

23、源原子提交目录版本化建立分支容易合并功能强大打标签方便更好的二进制处理Subtrain - SVN User Training Polarion Software 200714SVN与与VSS的区别的区别SVN数据库不共享，更安全支持LINUX等更多操作系统默认可以多人同时修改一个文件更直观的打tag和建立分支Subversion 架构架构简介仓库(Repository) 布局全局修订版本号(revision)远程仓库和本地副本Subtrain - SVN User Training Polarion Software 200716Subversion 架构架构概述概述Berkley DBFS

24、FSSubversionRepositoryClient InterfaceRepository InterfaceGUI client appsCommandlineclient appsClientLibraryWorking Copy Management LibraryRepositoryaccessDAVSVNLocalApachemod_davmod_dav_svnsvnserveInternet(Any TCP/IP Network)Subtrain - SVN User Training Polarion Software 200717file:/ 直接版本库访问（本地磁盘）。

25、svn:/ 通过未认证TCP/IP的svnserve服务自定义协议。svn+ssh:/ 认证并加密的TCP/IP访问，通过自定义协议访问svnserve服务器。http:/ 通过配置Subversion的Apache服务器的WebDAV协议。https:/和 http:/一样, 但使用 SSL 加密. (新浪使用https协议访问，且采用邮箱LDAP认证)Subversion 架构架构访问访问 URLsSubtrain - SVN User Training Polarion Software 200718tagsbranches trunkProject 1RootProject 2Subv

26、ersion 架构架构仓库仓库(Repository)布局布局tagsbranches trunksrcdoc源代码文档Subtrain - SVN User Training Polarion Software 200719Subversion 架构架构仓库仓库(Repository)布局布局Subtrain - SVN User Training Polarion Software 200720Subversion 架构架构仓库仓库(Repository)布局布局主干：开发主线标签：存放各里程碑的快照分支：并行开发，如缺陷修复tagsbranches trunkProject 1RootP

27、roject 2tagsbranches trunkSubtrain - SVN User Training Polarion Software 200721Subversion 架构架构修订版本号修订版本号(revision )0 1 2 3Subtrain - SVN User Training Polarion Software 200722Subversion 架构架构修订版本号修订版本号(revision )每次提交产生一个修订版本号(revision)=整个仓库的整体版本递增原子提交产生的修订版本号(revision)在每个仓库都是全局唯一的Subtrain - SVN User

28、Training Polarion Software 200723Subversion 架构架构远程仓库和本地副本远程仓库和本地副本CommitServerThe client machineRemote RepositoryURL: Working CopyCheckout/UpdateSubtrain - SVN User Training Polarion Software 200724Subversion 架构架构远程仓库和本地副本远程仓库和本地副本.svn的文件夹本地副本管理目录问题：如果把.svn目录删除，会怎样？如果把Working copy拷贝到另一个项目目录里想作为新目录提交

29、，会怎样？典型工作流程 概述导入(Import)检出(Checkout)查看变动(Looking for Changes)提交(Commit)添加、删除、移动/更名“反悔”(revert)Subtrain - SVN User Training Polarion Software 200726典型工作流程典型工作流程svn checkout获得内容svn addsvn movesvn deletesvn rename修改svn status -u 看看我在本地都修改了哪些？svn update更新本地工作副本(working copy)svn diffsvn resolved合并(Merge)

30、你的修改解决冲突svn commit提交你的修改105100106Subversion仓库(Repository)Subtrain - SVN User Training Polarion Software 2007273个功能足矣个功能足矣svn checkoutsvn updatesvn commitSubversionRepositorySubtrain - SVN User Training Polarion Software 200728将本地存储的项目导入(import)远程仓库Repository ServerThe client machine典型工作流程典型工作流程将项目导入

31、将项目导入 SubversionSubtrain - SVN User Training Polarion Software 200729典型工作流程典型工作流程用命令行导入用命令行导入(import)项目项目切换到你想导入的项目目录下svn import . http:/svnserver/ -m”- Import Message”使用subversion 子命令 “import .你想导入的目录(包括整个子目录树)，也可以使用绝对路径.仓库(repository) URL.提交日志选项.用双引号包含提交日志.Subtrain - SVN User Training Polarion Sof

32、tware 200730典型工作流程典型工作流程用命令行导入用命令行导入(import)项目项目Subtrain - SVN User Training Polarion Software 200731典型工作流程典型工作流程用用TortoiseSVN导入导入(import)项目项目Subtrain - SVN User Training Polarion Software 200732典型工作流程典型工作流程用用TortoiseSVN导入导入(import)项目项目Subtrain - SVN User Training Polarion Software 200733检出(check ou

33、t) 将项目从服务器仓库(repository ) 传到本地的客户机上Repository ServerThe client machine 检出工作副本(working copy)典型工作流程典型工作流程检出检出(Check Out)Subtrain - SVN User Training Polarion Software 200734典型工作流程典型工作流程用命令行检出用命令行检出(Check Out)检出检出(Check Out)项目是与他人协同工作的第一步项目是与他人协同工作的第一步:svn checkout http:/svnserver/ 使用Subversion子命令 “che

34、ckout.仓库(Repository) URL.本地存储项目的目录，也就是所谓的工作副本(working copy, WC)Subtrain - SVN User Training Polarion Software 200735典型工作流程典型工作流程用命令行检出用命令行检出(Check Out)Subtrain - SVN User Training Polarion Software 200736典型工作流程典型工作流程用用TortoiseSVN 检出检出(Check Out)Subtrain - SVN User Training Polarion Software 200737典型

35、工作流程典型工作流程用用TortoiseSVN 检出检出(Check Out)Subtrain - SVN User Training Polarion Software 200738典型工作流程典型工作流程用命令行更新用命令行更新(Update)切换到希望更新的目录，更新切换到希望更新的目录，更新(Update) :svn update使用Subversion子命令 “update.Subtrain - SVN User Training Polarion Software 200739典型工作流程典型工作流程用命令行更新用命令行更新(Update)Subtrain - SVN User T

36、raining Polarion Software 200740典型工作流程典型工作流程用用TortoiseSVN更新更新(Update)Subtrain - SVN User Training Polarion Software 200741典型工作流程典型工作流程用命令行添加文件用命令行添加文件/目录目录(add)添加只意味本地工作副本修改了，待下次提交时，才添加到仓库中.svn add file(s) 使用Subversion子命令“add”- 用空格分隔的一个或多个文件，如果是目录，目录中整个目录树、文件都会被添加，当然，也可以用-non-recursive (-N) 选项来改变.Su

37、btrain - SVN User Training Polarion Software 200742典型工作流程典型工作流程用命令行添加文件用命令行添加文件/目录目录(add)Subtrain - SVN User Training Polarion Software 200743典型工作流程典型工作流程用用TortoiseSVN添加文件添加文件/目录目录(add)Subtrain - SVN User Training Polarion Software 200744典型工作流程典型工作流程用命令行删除文件用命令行删除文件/目录目录(delete)删除 文件/目录:svn delete f

38、ile(s)使用Subversion子命令 “delete”用空格分隔的一个或多个文件，这些文件将会被标记为计划删除. 如果是目录，那么其子目录(递归)都将被删除.如果想删除已经修改了的文件，请用-force 选项.Subtrain - SVN User Training Polarion Software 200745典型工作流程典型工作流程用命令行删除文件用命令行删除文件/目录目录(delete)Subtrain - SVN User Training Polarion Software 200746典型工作流程典型工作流程用用TortoiseSVN删除文件删除文件/目录目录(delete

39、)Subtrain - SVN User Training Polarion Software 200747典型工作流程典型工作流程用用TortoiseSVN更改文件更改文件/目录名目录名(rename)Subtrain - SVN User Training Polarion Software 200748典型工作流程典型工作流程命令回顾命令回顾获取 更新添加文件或目录删除文件或目录更改文件或目录名Subtrain - SVN User Training Polarion Software 200749典型工作流程典型工作流程用命令行移动文件用命令行移动文件/目录目录(move)文件/目录更

40、名:svn move source destination使用Subversion 子命令 “move.要更名/移动的源文件/目录.目标文件/目录.Subtrain - SVN User Training Polarion Software 200750典型工作流程典型工作流程用命令行移动文件用命令行移动文件/目录目录(move)Subtrain - SVN User Training Polarion Software 200751典型工作流程典型工作流程用命令行复制文件用命令行复制文件/目录目录(copy)复制文件/目录:svn copy source destination使用Subve

41、rsion 子命令“copy.源文件/目录.目标文件/目录.Subtrain - SVN User Training Polarion Software 200752典型工作流程典型工作流程用命令行复制文件用命令行复制文件/目录目录(copy)Subtrain - SVN User Training Polarion Software 200753典型工作流程典型工作流程用用TortoiseSVN移动移动/复制复制 文件文件/目录目录(move,copy)用TortoiseSVN移动/复制 文件/目录 用右键拖拽要移动/复制的源目录到目标目录，松开右键就会看到下面用于复制/移动的右键菜单Sub

42、train - SVN User Training Polarion Software 200754典型工作流程典型工作流程用命令行提交用命令行提交(commit)修改修改提交你的修改:svn commit -m”- Log Message”用Subversion 子命令 “commit .提交日志选项.提交日志.如果你没有用 -m 选项，subversion 会调用缺省编辑器让你书写提交日志.Subtrain - SVN User Training Polarion Software 200755典型工作流程典型工作流程用命令行提交用命令行提交(commit)修改修改Subtrain - S

43、VN User Training Polarion Software 200756典型工作流程典型工作流程用用TortoiseSVN提交提交(commit)修改修改Subtrain - SVN User Training Polarion Software 200757典型工作流程典型工作流程用用TortoiseSVN提交提交(commit)修改修改Subtrain - SVN User Training Polarion Software 200758典型工作流程典型工作流程注意注意 用下面的subversion 命令，而不要直接移动、删除、拷贝、创建目录:svn movesvn delet

44、esvn copysvn mkdir如果使用集成在Explorer中的TortoiseSVN会更省事儿Subtrain - SVN User Training Polarion Software 200759检查一下有什么东西改动了svn statusSubversion 子命令 “status” .典型工作流程典型工作流程用命令行查看变动用命令行查看变动(status)Subtrain - SVN User Training Polarion Software 200760典型工作流程典型工作流程用命令行查看变动用命令行查看变动(status)Subtrain - SVN User Trai

45、ning Polarion Software 200761典型工作流程典型工作流程用命令行查看变动用命令行查看变动(status)命令行输出的第一列命令行输出的第一列(文件状态文件状态)解释：解释：A: 计划提交到仓库计划提交到仓库(repository)中的文件、目录或符号链接中的文件、目录或符号链接.C: 处于冲突状态中的文件。这意味着，在你检出文件修改期间，有人修改并提交了这个文件，你得在提交前解决冲突.D: 计划在仓库计划在仓库(repository)中删除的文件、目录或符号链接中删除的文件、目录或符号链接.R: 将会被仓库(repository) 替换的文件、目录或符号链接。也就是说

46、，它们已经在仓库中(repository)中被删除，然后新增了一个同名对象，所有的这些都在一个修订版本号(revision)中发生的.X: 纳入版本控制的目录，但与外部Subversion仓库相关.?: 没有纳入版本控制的文件、目录或符号链接没有纳入版本控制的文件、目录或符号链接. !: 纳入版本控制的文件、目录或符号链接不见或是不完成。通常发生这样的情况都是因为纳入版本控制的文件、目录或符号链接不见或是不完成。通常发生这样的情况都是因为用了非用了非subversion的方法移除了这些文件。的方法移除了这些文件。. = svn update 可以从服务器重新取出文件、目录 或= svn rev

47、ert file 可以 恢复不见了的文件.:纳入版本控制的文件、目录或符号链接，在你的本地工作副本的却是其它形式，删除或新建目录。I: 由于Subversion 的“忽略”设置而没有纳入版本控制的文件、目录或符号链接Subtrain - SVN User Training Polarion Software 200762Status normalAdded file/directorydeleted file/directoryLockedModifiedRead only典型工作流程典型工作流程用用TortoiseSVN查看变动查看变动(status)Subtrain - SVN User

48、Training Polarion Software 200763典型工作流程典型工作流程用命令行比较差异用命令行比较差异(diff)比较修改后和修改前的差异:svn diff使用Subversion子命令 “diff” .如果没有任何选项，你所看的diff结果是本地工作副本和.svn目录中保存的缓存的比较结果.Subtrain - SVN User Training Polarion Software 200764典型工作流程典型工作流程用命令行比较差异用命令行比较差异(diff)Subtrain - SVN User Training Polarion Software 200765典型工

49、作流程典型工作流程用用TortoiseSVN比较差异比较差异(diff)查看本地文件修改后与修改前的差异: 方法1：右键菜单 Menu - Diff如果是文本文件，则通过SVN的merge工具比较如果是office文档，则通过office自带的合并功能在修订列表中显示Subtrain - SVN User Training Polarion Software 200766典型工作流程典型工作流程用用TortoiseSVN比较差异比较差异(diff)方法2：Commit时进行比较Subtrain - SVN User Training Polarion Software 200767典型工作流程

50、典型工作流程用命令行用命令行“反悔反悔”(revert)用命令行来”反悔”:svn revert destination 使用 Subversion 子命令“revert”. 要”反悔”的目标文件/目录.如果你想”反悔”整个目录中的文件/目录, 用 “ -recursive“ 选项. Subtrain - SVN User Training Polarion Software 200768典型工作流程典型工作流程用用TortoiseSVN“反悔反悔”(revert)我在本地的SVN某个操作取消，回滚到修改前的状态，而不是仓库最新状态。右键菜单 TortoiseSVN - Revert或Chec

51、k for modifications中Revert或Subtrain - SVN User Training Polarion Software 200769典型工作流程典型工作流程 “反悔反悔”(revert)反悔(revert)操作是如何实现的?Subversion 检出时，在本地工作副本的.svn中存了一个 “pristine” 副本.下面所有的操作都能回滚:addremovecopydeletemkdir但如果已提交，这个操作就不管用了.Subtrain - SVN User Training Polarion Software 200770典型工作流程典型工作流程命令回顾命令回顾移

52、动复制提交查看变动比较差异“反悔”撤销修改Subtrain - SVN User Training Polarion Software 200771典型工作流程典型工作流程TortoiseSVN常用命令一览常用命令一览All SubTrain materials are published under the Creative Commons Attribution License and contain material from other works published under the same license. To view a copy of this license, vis

53、it /licenses/by/2.0/ or send a letter to Creative Commons, 559 Nathan AbbottWay, Stanford, California 94305, USA. Special thanks to the authors of the comprehensive subversion book book “Version Control with Subversion” by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Mi

54、chael Pilato. You are free to adjust the materials to your needs. Please respect our work by adding the SubTrain logo to your slides.典型工作流程典型工作流程沙盘演练沙盘演练Subtrain - SVN User Training Polarion Software 200773沙盘演练沙盘演练从模拟沙盘中检出（checkout） URL of repository: https:/ /项目URLStart Your Engine! (限时:10分钟)指导、讲评S

55、ubtrain - SVN User Training Polarion Software 200774演练回顾演练回顾大家谈谈在演练中自己的操作如何？列举1、2、3。Subtrain - SVN User Training Polarion Software 200775常见问题常见问题(FAQ)对文件的常见不正确操作重命名Rename：提个醒先删除Delete，后添加Add直接改名后，提交commit 移动Move 将文件移动到非SVN目录（即本地私有目录） 用左键拖曳Subtrain - SVN User Training Polarion Software 200776常见问题常见问题

56、(FAQ) Cont.提交Commit修改到什么时候commit？ 推荐：已完成一个任务且本地验证无误。在哪里使用Commit？ 推荐：本地副本的根目录下提交，方便找出所有子目录中待提交的文件。All SubTrain materials are published under the Creative Commons Attribution License and contain material from other works published under the same license. To view a copy of this license, visit http:/cre

57、/licenses/by/2.0/ or send a letter to Creative Commons, 559 Nathan AbbottWay, Stanford, California 94305, USA. Special thanks to the authors of the comprehensive subversion book book “Version Control with Subversion” by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato

58、. You are free to adjust the materials to your needs. Please respect our work by adding the SubTrain logo to your slides.TortoiseSVN其它常用操作Subtrain - SVN User Training Polarion Software 200778查看查看Subtrain - SVN User Training Polarion Software 200779本地和某个本地和某个revision的多文件比较的多文件比较选中要获取的目录或文件，选择show log

59、Subtrain - SVN User Training Polarion Software 200780两个两个revision间的多文件比较间的多文件比较Subtrain - SVN User Training Polarion Software 200781如何获取某个历史如何获取某个历史revision的文件的文件操作：选择某个目录，show log，对某个revison，CheckoutSubtrain - SVN User Training Polarion Software 200782通过属性将文件只读通过属性将文件只读选中某个文件，选择properties属性，选中Add添加

60、，property name选择svn:needs-lock，最后对该文件执行Commit后将生效。文件图标改成“只读”，任何人都不能修改。直到删除该属性。Subtrain - SVN User Training Polarion Software 200783通过属性设置共享目录通过属性设置共享目录选中某个目录，选择properties属性，选中Add添加，property name选择svn:externals，value写上 目录名 URL。Ok后提交即生效。Subtrain - SVN User Training Polarion Software 200784设置添加目录文件时需忽略