Subversion TutorialSubversion Tutorial

Presenter: Ya-Lin Huang

IntroductionIntroduction

版本控制系統是什麼？管理對資訊所做人為變動程式設計師的工具之一

為何要使用版本控制系統？促成有效率的團隊合作使變動歷程能被追溯

2

The RepositoryThe Repository

Subversion is a centralized system for sharing information.A repository is a central store of data in the form of a file system tree — a typical hierarchy of files and directories.

3

Problem of File-Sharing Problem of File-Sharing

4

Lock-Modify-Unlock Solution Lock-Modify-Unlock Solution

5

Copy-Modify-Merge Solution Copy-Modify-Merge Solution

6

SubversionSubversion

http://subversion.tigris.org/

http://svnbook.red-bean.com/

Subversion is the free/open-source version control system

Manages files and directories over time.

Remember every change even made to files and directories.

Allows to recover older version of the code or examine the history of how your data changed.

Collaborative editing and sharing of data (source code).

7

TerminologyTerminology

檔案庫 (Repository)物件變更紀錄維護貯放物件的關聯性集中式管理

工作副本 (Working Copy)檔案庫物件 ( 部份或全部 )在某個時間點的快照可修改，可復原

Repository的程式可分為主幹線 (Trunk)開發者

支線 (Branch)維護者

標記 (Tag)標示點

8

SubversionSubversion

Subversion Repository

Subversionlibrary

Internet/Intranet(any TCP/IP Network)

Client interface

Command line

TortoiseSVN

Subversionserver

http://joolz.csie.ncku.edu.tw/svn/team_name

projectrepository

your project working copyProj

SPMSPMProj9

RepositoryRepositoryAccess Mode

The SVN server of Lab. is constructed in Apache server

10

SVN CLIENSVN CLIENTT

11

SVN Client : TortoiseSVNSVN Client : TortoiseSVNhttp://tortoisesvn.sourceforge.net/

TortoiseSVN is a free open-source client for the Subversion version control system.

Extension for the Windows Explorer.

Icons overlay shows all versioned / modified files.

All Subversion commands available from the explorer context menu.

available via a simple right click.

TortoiseSVN requires the administrative rights on your computer to be installed.

TortoiseSVN is a free open-source client for the Subversion version control system.

Extension for the Windows Explorer.

Icons overlay shows all versioned / modified files.

All Subversion commands available from the explorer context menu.

available via a simple right click.

TortoiseSVN requires the administrative rights on your computer to be installed.

12

Explorer showing icon overlaysExplorer showing icon overlays

13

Create a new SVNCreate a new SVN folder using repo-browser(1/2)folder using repo-browser(1/2)

1) Choose a folder.2) Right click on the folder. (see as fig. below) Then enter the

svn URL and authentication information.

14

Create a new SVNCreate a new SVN folder using repo-browser (2/2)folder using repo-browser (2/2)

3) Right click on a folder in repo-browser window.4) Enter folder’s name and log message if necessary.

15

Create a local checkout folder.(1/2)Create a local checkout folder.(1/2)

1) Create a new folder.2) Right click on the folder. Choose “SVN Checkout”3) URL of the repository:

http://joolz.csie.ncku.edu.tw/svn/Student_Package

16

Create a local checkout folder.(2/2)Create a local checkout folder.(2/2)

17

TortoiseSVN: TortoiseSVN: Commit(1/2)Commit(1/2)

At local checkout folder…

18

Auto-completion

Files Checkbox

TortoiseSVN: TortoiseSVN: Commit(2/2)Commit(2/2)

19

TortoiseSVN: UpdateTortoiseSVN: Update

Case 1: your SVN files needed to be updated.Case 2: your SVN files are up-to-date.

20

TortoiseSVN:TortoiseSVN: Conflicted(1/3)Conflicted(1/3)

Repository: Revision 11 Local: Modify Revision 9

21

TortoiseSVN:TortoiseSVN: Conflicted(2/3)Conflicted(2/3)

At this moment, whatever you do…

22

Update.

Commit.

TortoiseSVN:TortoiseSVN: Conflicted(3/3)Conflicted(3/3)

23

ExerciseExercise

安裝 SubversionTortoiseSVN

http://tortoisesvn.net/

下載實驗室重要資料Repository

http://joolz.csie.ncku.edu.tw/svn/Student_Package

上傳畢業光碟資料svn commit

URL: 各組連結

24