A Subversion client for Windows

Version 1.6.16

Stefan Küng

Lübbe Onken

Simon Large

2011/06/10 17:41:21 (r21547)

Table of Contents

Reading Guide
TortoiseSVN is free!
Terminology used in this document
1. Introduction
What is TortoiseSVN?
TortoiseSVN's History
TortoiseSVN's Features
Installing TortoiseSVN
System requirements
Language Packs
2. Basic Version-Control Concepts
The Repository
Versioning Models
The Problem of File-Sharing
The Lock-Modify-Unlock Solution
The Copy-Modify-Merge Solution
What does Subversion Do?
Subversion in Action
Working Copies
Repository URLs
How Working Copies Track the Repository
3. The Repository
Repository Creation
Creating a Repository with the Command Line Client
Creating The Repository With TortoiseSVN
Local Access to the Repository
Accessing a Repository on a Network Share
Repository Layout
Repository Backup
Server side hook scripts
Checkout Links
Accessing the Repository
Svnserve Based Server
Installing svnserve
Running svnserve
Basic Authentication with svnserve
Better Security with SASL
Authentication with svn+ssh
Path-based Authorization with svnserve
Apache Based Server
Installing Apache
Installing Subversion
Multiple Repositories
Path-Based Authorization
Authentication With a Windows Domain
Multiple Authentication Sources
Securing the server with SSL
Using client certificates with virtual SSL hosts
4. Daily Use Guide
Getting Started
Icon Overlays
Context Menus
Drag and Drop
Common Shortcuts
Maximizing Windows
Importing Data Into A Repository
Import in Place
Special Files
Checking Out A Working Copy
Checkout Depth
Committing Your Changes To The Repository
The Commit Dialog
Change Lists
Excluding Items from the Commit List
Commit Log Messages
Commit Progress
Update Your Working Copy With Changes From Others
Resolving Conflicts
File Conflicts
Tree Conflicts
Getting Status Information
Icon Overlays
TortoiseSVN Columns In Windows Explorer
Local and Remote Status
Viewing Diffs
Change Lists
Revision Log Dialog
Invoking the Revision Log Dialog
Revision Log Actions
Getting Additional Information
Getting more log messages
Current Working Copy Revision
Merge Tracking Features
Changing the Log Message and Author
Filtering Log Messages
Statistical Information
Offline Mode
Refreshing the View
Viewing Differences
File Differences
Line-end and Whitespace Options
Comparing Folders
Diffing Images Using TortoiseIDiff
External Diff/Merge Tools
Adding New Files And Directories
Copying/Moving/Renaming Files and Folders
Ignoring Files And Directories
Pattern Matching in Ignore Lists
Deleting, Moving and Renaming
Deleting files and folders
Moving files and folders
Changing case in a filename
Dealing with filename case conflicts
Repairing File Renames
Deleting Unversioned Files
Undo Changes
Project Settings
Subversion Properties
TortoiseSVN Project Properties
External Items
External Folders
External Files
Branching / Tagging
Creating a Branch or Tag
To Checkout or to Switch...
Merging a Range of Revisions
Reintegrate a branch
Merging Two Different Trees
Merge Options
Reviewing the Merge Results
Merge Tracking
Handling Conflicts during Merge
Merge a Completed Branch
Feature Branch Maintenance
How Locking Works in Subversion
Getting a Lock
Releasing a Lock
Checking Lock Status
Making Non-locked Files Read-Only
The Locking Hook Scripts
Creating and Applying Patches
Creating a Patch File
Applying a Patch File
Who Changed Which Line?
Blame for Files
Blame Differences
The Repository Browser
Revision Graphs
Revision Graph Nodes
Changing the View
Using the Graph
Refreshing the View
Pruning Trees
Exporting a Subversion Working Copy
Removing a working copy from version control
Relocating a working copy
Integration with Bug Tracking Systems / Issue Trackers
Adding Issue Numbers to Log Messages
Getting Information from the Issue Tracker
Integration with Web-based Repository Viewers
TortoiseSVN's Settings
General Settings
Revision Graph Settings
Icon Overlay Settings
Network Settings
External Program Settings
Saved Data Settings
Log Caching
Client Side Hook Scripts
TortoiseBlame Settings
Registry Settings
Subversion Working Folders
Final Step
5. The SubWCRev Program
The SubWCRev Command Line
Keyword Substitution
Keyword Example
COM interface
6. IBugtraqProvider interface
The IBugtraqProvider interface
The IBugtraqProvider2 interface
A. Frequently Asked Questions (FAQ)
B. How Do I...
Move/copy a lot of files at once
Force users to enter a log message
Hook-script on the server
Project properties
Update selected files from the repository
Roll back (Undo) revisions in the repository
Use the revision log dialog
Use the merge dialog
Use svndumpfilter
Compare two revisions of a file or folder
Include a common sub-project
Use svn:externals
Use a nested working copy
Use a relative location
Create a shortcut to a repository
Ignore files which are already versioned
Unversion a working copy
Remove a working copy
C. Useful Tips For Administrators
Deploy TortoiseSVN via group policies
Redirect the upgrade check
Setting the SVN_ASP_DOT_NET_HACK environment variable
Disable context menu entries
D. Automating TortoiseSVN
TortoiseSVN Commands
TortoiseIDiff Commands
E. Command Line Interface Cross Reference
Conventions and Basic Rules
TortoiseSVN Commands
Update to Revision
Show Log
Check for Modifications
Revision Graph
Repo Browser
Edit Conflicts
Get Lock
Release Lock
Create Repository Here
Add to Ignore List
Create Patch
Apply Patch
F. Implementation Details
Icon Overlays
G. Securing Svnserve using SSH
Setting Up a Linux Server
Setting Up a Windows Server
SSH Client Tools for use with TortoiseSVN
Creating OpenSSH Certificates
Create Keys using ssh-keygen
Create Keys using PuTTYgen
Test using PuTTY
Testing SSH with TortoiseSVN
SSH Configuration Variants

List of Figures

2.1. A Typical Client/Server System
2.2. The Problem to Avoid
2.3. The Lock-Modify-Unlock Solution
2.4. The Copy-Modify-Merge Solution
2.5. ...Copy-Modify-Merge Continued
2.6. The Repository's Filesystem
2.7. The Repository
3.1. The TortoiseSVN menu for unversioned folders
4.1. Explorer showing icon overlays
4.2. Context menu for a directory under version control
4.3. Explorer file menu for a shortcut in a versioned folder
4.4. Right drag menu for a directory under version control
4.5. Authentication Dialog
4.6. The Import dialog
4.7. The Checkout dialog
4.8. The Commit dialog
4.9. The Commit Dialog Spellchecker
4.10. The Progress dialog showing a commit in progress
4.11. Progress dialog showing finished update
4.12. Explorer showing icon overlays
4.13. Check for Modifications
4.14. Commit dialog with Changelists
4.15. The Revision Log Dialog
4.16. The Revision Log Dialog Top Pane with Context Menu
4.17. Top Pane Context Menu for 2 Selected Revisions
4.18. The Log Dialog Bottom Pane with Context Menu
4.19. The Log Dialog Showing Merge Tracking Revisions
4.20. Commits-by-Author Histogram
4.21. Commits-by-Author Pie Chart
4.22. Commits-by-date Graph
4.23. Go Offline Dialog
4.24. The Compare Revisions Dialog
4.25. The image difference viewer
4.26. Explorer context menu for unversioned files
4.27. Right drag menu for a directory under version control
4.28. Explorer context menu for unversioned files
4.29. Explorer context menu for versioned files
4.30. Revert dialog
4.31. Explorer property page, Subversion tab
4.32. Subversion property page
4.33. Adding properties
4.34. The Branch/Tag Dialog
4.35. The Switch Dialog
4.36. The Merge Wizard - Select Revision Range
4.37. The Merge Wizard - Reintegrate Merge
4.38. The Merge Wizard - Tree Merge
4.39. The Merge Conflict Callback Dialog
4.40. The Merge reintegrate Dialog
4.41. The Locking Dialog
4.42. The Check for Modifications Dialog
4.43. The Create Patch dialog
4.44. The Annotate / Blame Dialog
4.45. TortoiseBlame
4.46. The Repository Browser
4.47. A Revision Graph
4.48. The Export-from-URL Dialog
4.49. The Relocate Dialog
4.50. Example issue tracker query dialog
4.51. The Settings Dialog, General Page
4.52. The Settings Dialog, Context Menu Page
4.53. The Settings Dialog, Dialogs 1 Page
4.54. The Settings Dialog, Dialogs 2 Page
4.55. The Settings Dialog, Colours Page
4.56. The Settings Dialog, Revision Graph Page
4.57. The Settings Dialog, Revision Graph Colors Page
4.58. The Settings Dialog, Icon Overlays Page
4.59. The Settings Dialog, Icon Set Page
4.60. The Settings Dialog, Network Page
4.61. The Settings Dialog, Diff Viewer Page
4.62. The Settings Dialog, Diff/Merge Advanced Dialog
4.63. The Settings Dialog, Saved Data Page
4.64. The Settings Dialog, Log Cache Page
4.65. The Settings Dialog, Log Cache Statistics
4.66. The Settings Dialog, Hook Scripts Page
4.67. The Settings Dialog, Configure Hook Scripts
4.68. The Settings Dialog, Issue Tracker Integration Page
4.69. The Settings Dialog, TortoiseBlame Page
C.1. The upgrade dialog

List of Tables

2.1. Repository Access URLs
3.1. Apache httpd.conf Settings
5.1. List of available command line switches
5.2. List of available command line switches
5.3. COM/automation methods supported
C.1. Menu entries and their values
D.1. List of available commands and options
D.2. List of available options