34
............................................................................................................................................ Intro to Subversion ............................................................................................................................................ Wendy Smoak 27 October 2006

Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

  • Upload
    others

  • View
    16

  • Download
    0

Embed Size (px)

Citation preview

Page 1: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

............................................................................................................................................

Intro to Subversion

............................................................................................................................................

Wendy Smoak 27 October 2006

Page 2: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL
Page 3: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

Table of Contents............................................................................................................................................

1 TortoiseSVN1.1 Create. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 1

1.2 Import. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4

1.3 Checkout. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 8

1.4 Commit. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 13

2 Command Line2.1 Create. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 18

2.2 Import. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 19

2.3 Checkout. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 20

2.4 Commit. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 21

3 Repository Viewing3.1 Repo Browser. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 23

3.2 ViewVC. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 27

3.3 Fisheye. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 29

4 IDE Integration4.1 IntelliJ IDEA. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 30

T A B L E O F C O N T E N T S i

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 4: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

TABLE OF CONTENTS ii

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 5: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.1 Create............................................................................................................................................

TortoiseSVN Create Repository

Create a new folder.

Right-click on the new folder, and choose Create repository here.

1 . 1 C R E A T E 1

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 6: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

Choose the type of the repository: FSFS

The repository was successfully created.

1 . 1 C R E A T E 2

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 7: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

The structure of a file-system repository:

1 . 1 C R E A T E 3

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 8: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.2 Import............................................................................................................................................

TortoiseSVN Import

Navigate to the files you want to import. Right-click, choose TortoiseSVN -> Import.

1 . 2 I M P O R T 4

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 9: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

Provide the repository URL. Intermediate directories will be created.

Confirmation:

1 . 2 I M P O R T 5

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 10: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

Viewing the results with Repo-browser. (Right-click, TortoiseSVN -> Repo-browser, enter URL.)

1 . 2 I M P O R T 6

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 11: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.2 IMPORT 7

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 12: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.3 Checkout............................................................................................................................................

Check out with TortioseSVN

Right click and choose SVN Checkout.

Enter URL of repository and checkout directory

1 . 3 C H E C K O U T 8

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 13: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

Answer 'Yes' to create the directory

1 . 3 C H E C K O U T 9

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 14: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.3 CHECKOUT 10

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 15: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

Windows Explorer view of the working copy.

1 . 3 C H E C K O U T 11

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 16: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

(Tip: This is a 'Rooted View', created with explorer.exe /e,/root,c:\codecamp.)

1 . 3 C H E C K O U T 12

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 17: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.4 Commit............................................................................................................................................

TortoiseSVN Commit

Make changes to a file...

TortoiseSVN shows icon overlays indicating which files have uncommitted changes.

1 . 4 C O M M I T 13

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 18: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

Navigate to the files you want to commit. Right-click, choose TortoiseSVN -> Import.

1 . 4 C O M M I T 14

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 19: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.4 COMMIT 15

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 20: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.4 COMMIT 16

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 21: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

1.4 COMMIT 17

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 22: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

2.1 Create............................................................................................................................................

Create a Repository

Use svnadmin to create a repository.

2 . 1 C R E A T E 18

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 23: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

2.2 Import............................................................................................................................................

Import a Project at the command line

2 . 2 I M P O R T 19

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 24: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

2.3 Checkout............................................................................................................................................

Check out with command line svn

2 . 3 C H E C K O U T 20

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 25: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

2.4 Commit............................................................................................................................................

Commit changes with command line svn

2 . 4 C O M M I T 21

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 26: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

2.4 COMMIT 22

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 27: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

3.1 Repo Browser............................................................................................................................................

TortoiseSVN Repo Browser

3 . 1 R E P O B R O W S E R 23

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 28: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

3.1 REPO BROWSER 24

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 29: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

3.1 REPO BROWSER 25

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 30: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

3.1 REPO BROWSER 26

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 31: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

3.2 ViewVC............................................................................................................................................

ViewVC

3 . 2 V I E W V C 27

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 32: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

3.2 VIEWVC 28

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 33: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

3.3 Fisheye............................................................................................................................................

Fisheye

3 . 3 F I S H E Y E 29

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D

Page 34: Intro to Subversion - Wendy Smoakwsmoak.net/subversion/demo/svn-intro.pdf · Intro to Subversion ... Commit changes with command line svn 2.4 COMMIT 21 ©2006, Wendy Smoak • ALL

4.1 IntelliJ IDEA............................................................................................................................................

Subversion Integration with IntelliJ IDEA

4 . 1 I N T E L L I J I D E A 30

© 2 0 0 6 , W e n d y S m o a k • A L L R I G H T S R E S E R V E D