How to use the TortoiseSVN Repository software

Installing the software:

• Download the TortoiseSVN software from http://tortoisesvn.net/downloads.
  • Select the link for the current version of the software which matches the specifications of your computer.
  • The most common case is the 32 Bit version of the following format: TortoiseSVN-x.x.x.xxxx-win32-svn-x.x.x.msi
  • Currently, only windows is supported.
• Install the executable *.msi file.
  • Click next
  • Check "I accept..", click next
  • Leaving the default settings and location, click next
  • Click install
  • Click finish
  • Restart your system (This is neccessary).

Using the software:

  Connecting to the Repository server:

• Right click on your desktop -> TortoiseSVN -> Repo-browser
• Enter the path to the server in the following format: http://ncr.mae.ufl.edu/svn/projectname (Note: For existing repositories, you may still use the old server temporarily svn://dixon1.mae.ufl.edu/projectname)
• Enter the username and password provided to you by Dr. Dixon
  • You may select 'Save Authentication' to prevent you from having to re-enter login information repeatedly.

  Checking out files from the Repository:

• Open the Repo-browser
• Right click on the entire repository folder and select Checkout
• Select the Checkout directory as the location to save the local copies of the files
  • You may specify a folder that does not exist. The folder will be created automatically.
  • Example: C:\Dixon\projectname
• Click ok, Click ok once finished
• Verify that the local copy of the files now exists in the location you specified. The folder should have a green check mark symbol on it. (You may need to refresh to see the new symbol).

  Making file changes:

• Before editing a file, be sure to update the file to the most recent working copy in the repository
  • Right click on your local project folder (or individual file) you wish to work with
  • Select SVN update
• Make necessary changes to your file or files
• Right click on the file(s) or folder you wish to commit to the repository server, select SVN Commit
• Enter a message describing the changes you have made to the file
• Click ok
• If the log message says Completed, your file should have a green check mark symbol on it. You are finished. (You may need to refresh to see the new symbol).
• If the log message says that your file is out of date, see section: Resolving conflicts.

  Resolving Conflicts:

• The most common error you will run into is an out of date error which looks like the following:
  Error     Commit failed (details follow):
  Error     Out of date: 'xxxx.xxx' in transaction 'xx-x'
  Error     You have to update your working copy first.
• Click ok to close the log window
• Update the file to the most recent working copy in the repository (you will not lose the new changes you have made to your file)
  • Right click on your local project folder (or individual file) you wish to work with
  • Select SVN update
• You will now receive the following message:
  Warning!     One or more files are in a conflicted state.
• Click ok to close the log window
• Your file will now have an yield exclamation point symbol on it, indicating a conflict.
• Right click on the conflicted file select TortoiseSVN -> Edit Conflicts
• TortoiseMerge will open
• Resolve the conflicting issues
  • Each conflicting line is highlighted in red
  • Select which version (Theirs or Mine) of each line you wish to keep by right clicking on the line and selecting the appropriate action
  • Once all of the conflicting lines have been resolved, click the Mark as Resolved button in the top toolbar (green check mark with exclamation sign)
• After resolving all conflicts, your file will now have a red circle exclamation point symbol on it, indicating the file has been modified and needs to be committed.
• Commit the file using the procedure described in the section: Making file changes.

Created by Nic Fischer
Last updated: June 6, 2007