• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
Svn
 

Svn

on

  • 784 views

 

Statistics

Views

Total Views
784
Views on SlideShare
735
Embed Views
49

Actions

Likes
0
Downloads
8
Comments
0

2 Embeds 49

http://wd.alibaba-inc.com 36
http://fd.aliued.cn 13

Accessibility

Categories

Upload Details

Uploaded via as Microsoft PowerPoint

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

    Svn Svn Presentation Transcript

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