Svn

802 views
757 views

Published on

Published in: Design, Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
802
On SlideShare
0
From Embeds
0
Number of Embeds
52
Actions
Shares
0
Downloads
10
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Svn

  1. 1. SVN<br />
  2. 2. 1.基本概念<br />Subversion是一个“集中式”的信息共享系统。版本库是Subversion的核心部分,是数据的中央仓库。版本库以典型的文件和目录结构形式文件系统树来保存信息。任意数量的客户端连接到Subversion版本库,读取、修改这些文件。客户端通过写数据将信息分享给其他人,通过读取数据获取别人共享的信息。<br />
  3. 3.
  4. 4. 2.实践<br />更新你的工作拷贝。<br />svn update<br />Make changes.<br />svn add<br />svn delete<br />svn copy<br />svn move<br />Examine your changes.<br />svn status<br />svn diff<br />Possibly undo some changes.<br />svn revert<br />Resolve conflicts (merge others' changes).<br />svn update<br />svn resolve<br />Commit your changes.<br />svn commit<br />
  5. 5. 3.状态<br />Aitem:预定加入版本库的内容<br />Citem:文件冲突,在更新中未能解决<br />Ditem:预定删除的内容<br />Mitem:文件内容被修改<br />Gitem:合并过文件内容<br />
  6. 6. 4.需要解决的问题<br />
  7. 7. 5.分支<br />分支的基本概念—正如它的名字,开发的一条线独立于另一条线,如果回顾历史,可以发现两条线分享共同的历史,一个分支总是从一个备份开始的,从那里开始,发展自己独有的历史<br />
  8. 8. 6.合并<br />(p) postpone - mark the conflict to be resolved later<br />(df) diff-full - show all changes made to merged file <br />(e) edit - change merged file in an editor<br />(r) resolved - accept merged version of file <br />(mf) mine-full - accept my version of entire file (ignore their changes) <br />(tf) theirs-full - accept their version of entire file (lose my changes) <br />(l) launch - launch external tool to resolve conflict <br />(h) help - show this list <br />
  9. 9. 7.命令<br />svn cp http://trunkhttp://branches/... –m “xxx”<br />svn co http://branches/... Dir<br />svnswhttp://branches/...<br />
  10. 10. 8.问题<br />分支的升级<br />svn cp 新分支<br />svnsw新分支<br />svn merge –r1:10 原分支<br />注意<br />不得有中文文件名<br />不得带有除’_/-’下划线中划线以外的符号<br />已合并的分支不得继续使用<br />
  11. 11. 7.忽略Thumbs.db<br />svnpropsetsvn:ignore ‘Thumbs.db’ dir<br />

×