TortoiseSVN A Subversion client for Windows Version 1.5.5 Stefan Küng Lübbe Onken Simon Large TortoiseSVN: A Subversion client for Windows: Version 1.5.5 by Stefan Küng, Lübbe Onken, and Simon Large Published Table of Contents Preface ........................................................................................................................... xi 1. Audience ............................................................................................................ xi 2. Reading Guide ..................................................................................................... xi 3. TortoiseSVN is free! ............................................................................................ xii 4. Community ........................................................................................................ xii 5. Acknowledgments ............................................................................................... xii 6. Terminology used in this document ........................................................................ xii 1. Introduction .................................................................................................................. 1 1.1. What is TortoiseSVN? ......................................................................................... 1 1.2. TortoiseSVN's History ......................................................................................... 1 1.3. TortoiseSVN's Features ........................................................................................ 1 1.4. Installing TortoiseSVN ........................................................................................ 2 1.4.1. System requirements ................................................................................. 2 1.4.2. Installation .............................................................................................. 3 1.4.3. Language Packs ....................................................................................... 3 1.4.4. Spellchecker ............................................................................................ 3 2. Basic Concepts ............................................................................................................. 5 2.1. The Repository ................................................................................................... 5 2.2. Versioning Models .............................................................................................. 5 2.2.1. The Problem of File-Sharing ...................................................................... 6 2.2.2. The Lock-Modify-Unlock Solution .............................................................. 6 2.2.3. The Copy-Modify-Merge Solution ............................................................... 7 2.2.4. What does Subversion Do? ....................................................................... 10 2.3. Subversion in Action ......................................................................................... 10 2.3.1. Working Copies ..................................................................................... 10 2.3.2. Repository URLs .................................................................................... 12 2.3.3. Revisions .............................................................................................. 12 2.3.4. How Working Copies Track the Repository ................................................. 14 2.4. Summary ......................................................................................................... 14 3. Setting Up A Server ..................................................................................................... 16 3.1. Apache Based Server ......................................................................................... 16 3.1.1. Introduction ........................................................................................... 16 3.1.2. Installing Apache .................................................................................... 16 3.1.3. Installing Subversion ............................................................................... 17 3.1.4. Configuration ......................................................................................... 18 3.1.5. Multiple Repositories .............................................................................. 20 3.1.6. Path-Based Authorization ......................................................................... 20 3.1.7. Authentication With a Windows Domain .................................................... 21 3.1.8. Multiple Authentication Sources ................................................................ 22 3.1.9. Securing the server with SSL .................................................................... 23 3.1.10. Using client certificates with virtual SSL hosts ........................................... 25 3.2. Svnserve Based Server ....................................................................................... 26 3.2.1. Introduction ........................................................................................... 26 3.2.2. Installing svnserve .................................................................................. 26 3.2.3. Running svnserve ................................................................................... 26 3.2.4. Basic Authentication with svnserve ............................................................ 28 3.2.5. Better Security with SASL ....................................................................... 29 3.2.6. Authentication with svn+ssh ..................................................................... 31 3.2.7. Path-based Authorization with svnserve ...................................................... 31 4. The Repository ............................................................................................................ 32 4.1. Repository Creation ........................................................................................... 32 4.1.1. Creating a Repository with the Command Line Client .................................... 32 4.1.2. Creating The Repository With TortoiseSVN ................................................ 32 4.1.3. Local Access to the Repository ................................................................. 33 4.1.4. Accessing a Repository on a Network Share ................................................ 33 iii TortoiseSVN 4.1.5. Repository Layout .................................................................................. 34 4.2. Repository Backup ............................................................................................ 35 4.3. Hook Scripts .................................................................................................... 36 4.4. Checkout Links ................................................................................................. 36 5. Daily Use Guide .......................................................................................................... 37 5.1. Getting Started ................................................................................................. 37 5.1.1. Icon Overlays ......................................................................................... 37 5.1.2. Context Menus ....................................................................................... 37 5.1.3. Drag and Drop ....................................................................................... 39 5.1.4. Common Shortcuts .................................................................................. 40 5.1.5. Authentication ........................................................................................ 40 5.1.6. Maximizing Windows .............................................................................. 41 5.2. Importing Data Into A Repository ........................................................................ 41 5.2.1. Import .................................................................................................. 41 5.2.2. Import in Place ...................................................................................... 43 5.2.3. Special Files .......................................................................................... 43 5.2.4. Referenced Projects ................................................................................. 43 5.3. Checking Out A Working Copy ........................................................................... 45 5.3.1. Checkout Depth ...................................................................................... 46 5.4. Committing Your Changes To The Repository ....................................................... 48 5.4.1. The Commit Dialog ................................................................................ 48 5.4.2. Change Lists .......................................................................................... 50 5.4.3. Excluding Items from the Commit List ....................................................... 50 5.4.4. Commit Log Messages ............................................................................ 50 5.4.5. Commit Progress .................................................................................... 52 5.5. Update Your Working Copy With Changes From Others .......................................... 52 5.6. Resolving Conflicts ........................................................................................... 54 5.7. Getting Status Information