29
Using TortoiseSVN

Using TortoiseSVN

  • Upload
    shiela

  • View
    129

  • Download
    1

Embed Size (px)

DESCRIPTION

Using TortoiseSVN. Tortoise SVN. If you are working on a system outside of the CSCI domain, you will need to install SVN. On a windows system, I recommend tortoisesvn You can go to the class web site for a link to tortoisesvn The slides that follow will demonstrate tortoisesvn. - PowerPoint PPT Presentation

Citation preview

Page 1: Using TortoiseSVN

Using TortoiseSVN

Page 2: Using TortoiseSVN

Tortoise SVN

• If you are working on a system outside of the CSCI domain, you will need to install SVN.

• On a windows system, I recommend tortoisesvn

• You can go to the class web site for a link to tortoisesvn

• The slides that follow will demonstrate tortoisesvn

Page 3: Using TortoiseSVN

• Your team repositories have already been created for you

• A repository is where you will share pages among team members.

Page 4: Using TortoiseSVN

• The following slides show you how to create a web site and share it among your team members.

• First create a new web site with Expression Web. You should agree upon folders needed in the web site.

• Suppose your site is named website.

Page 5: Using TortoiseSVN

Example

• Create the website• After you get to a point that you want to store

a copy in your team’s repository, then do the following steps.

Page 6: Using TortoiseSVN

Example

• First check out your team’s repository into a folder on your local system that is NOT in any repository.

• To do this, first create a folder to hold the repository, say cs4410/Project

Page 7: Using TortoiseSVN

Using Tortoisesvn

• Using tortoisesvn, right click on the Project folder previously created.

• The first time, you should get a pop up menu with the SVN Checkout option.

• Select the menu choice SVN Checkout• The following window should appear.• For the URL, team 1 would typesvn://svn.cs.mtsu.edu/c1426600/team/c142661

Page 8: Using TortoiseSVN

Replace the ‘1’ with your team’s number

Page 9: Using TortoiseSVN

Using Tortoisesvn

• After entering your team’s number on the previous screen and clicking ‘ok’, you should get an authentication window.

• Enter your 4410 account and original password.

• IF you are the only one using this computer system, i.e., your personal computer system, you may want to check the box ‘save authentication’

Page 10: Using TortoiseSVN

Authentication Window

Page 11: Using TortoiseSVN

Using Tortoisesvn

• If you are authenticated, then you will get a window similar to the following---the first time you checkout your repository

Page 12: Using TortoiseSVN

Click OK

Page 13: Using TortoiseSVN

Using Tortoisesvn

• Now on your windows system, go the folder containing your website directory.

• Copy the entire website directory• Save the website directory inside the Project

directory

Page 14: Using TortoiseSVN
Page 15: Using TortoiseSVN

Using Tortoisesvn

• Right click on the website directory found inside of the Project folder

• Choose the menu choice TortoiseSvn -> Add• You should get the next screen.

Page 16: Using TortoiseSVN
Page 17: Using TortoiseSVN

Using Tortoisesvn

• Click ok• You should get the next screen

Page 18: Using TortoiseSVN
Page 19: Using TortoiseSVN

Using Tortoisesvn

• Click ok• Now right click on the Project folder name• You should get a menu choice of SVN Commit• Select the SVN Commit option• You should then get a window similar to the

following

Page 20: Using TortoiseSVN
Page 21: Using TortoiseSVN

Using Tortoisesvn

• Click OK• You should get a screen similar to the

following

Page 22: Using TortoiseSVN
Page 23: Using TortoiseSVN

Using Tortoisesvn

• Click OK• Your website has been submitted to the

team’s repository

• SEE THE NEXT SLIDES FOR SUBMITTING CHANGES

Page 24: Using TortoiseSVN

Using TortoiseSVN AFTER you create website

• After you initially commit your website to your repository, use Expression Web on this copy as follows.

• Start Expression Web• Open existing website and browse to the

website under the Project folder, and open that website.

Page 25: Using TortoiseSVN

Using TortoiseSVN AFTER you create website

• Use Expression Web to make changes, edit, etc as desired. Save your work.

• Afterwards, right click on the website folder in the Project folder.

• Choose TortoiseSVN->Add• Click OK===there may be nothing to add• Right click on website folder again, choose

SVN Commit• Be sure to click ok after committing…

Page 26: Using TortoiseSVN

Get changes made by others

• Periodically, you should ensure that changes done by other team members get incorporated in your local working copy.

• This is known as updating.• This can be done on single files, as set of

selected files, or on an entire directory.• To update, select the files you want, right click

and select TortoiseSVN -> Update

Page 27: Using TortoiseSVN

Get changes made by others

• A window will pop up displaying the progress of the update as it runs.

• Changes done by others will be merged into your files, keeping any changes you may have done to the same files.

Page 28: Using TortoiseSVN

• The progress dialog uses color to highlight the different update actions:– Purple – New item added– Dark red – Redundant item deleted or missing

item replaced in your working copy– Green – Changes from repository successfully

merged with your local changes.– Bright red – Changes from repository merged

with local changes, resulting in conflicts which you need to resolve.

– Black – Unchanged item in your working copy updated with newer version from the repository.

Page 29: Using TortoiseSVN