TortoiseSVN A Subversion client for Windows Version 1.11 Stefan Küng Lübbe Onken Simon Large TortoiseSVN: A Subversion client for Windows: Version 1.11 by Stefan Küng, Lübbe Onken, and Simon Large Publication date 2018/09/22 18:28:22 (r28377) Table of Contents Preface ........................................................................................................................................ xi 1. What is TortoiseSVN? ....................................................................................................... xi 2. TortoiseSVN's Features ...................................................................................................... xi 3. License ........................................................................................................................... xii 4. Development ................................................................................................................... xii 4.1. TortoiseSVN's History ............................................................................................ xii 4.2. Acknowledgments ................................................................................................. xiii 5. Reading Guide ................................................................................................................ xiii 6. Terminology used in this document .................................................................................... xiv 1. Getting Started .......................................................................................................................... 1 1.1. Installing TortoiseSVN ..................................................................................................... 1 1.1.1. System requirements .............................................................................................. 1 1.1.2. Installation ........................................................................................................... 1 1.2. Basic Concepts ............................................................................................................... 1 1.3. Go for a Test Drive ......................................................................................................... 2 1.3.1. Creating a Repository ............................................................................................ 2 1.3.2. Importing a Project ............................................................................................... 2 1.3.3. Checking out a Working Copy ................................................................................ 3 1.3.4. Making Changes ................................................................................................... 4 1.3.5. Adding More Files ................................................................................................ 4 1.3.6. Viewing the Project History .................................................................................... 4 1.3.7. Undoing Changes .................................................................................................. 5 1.4. Moving On ... ................................................................................................................. 5 2. Basic Version-Control Concepts ................................................................................................... 7 2.1. The Repository ............................................................................................................... 7 2.2. Versioning Models .......................................................................................................... 7 2.2.1. The Problem of File-Sharing ................................................................................... 7 2.2.2. The Lock-Modify-Unlock Solution .......................................................................... 8 2.2.3. The Copy-Modify-Merge Solution ........................................................................... 9 2.2.4. What does Subversion Do? ................................................................................... 11 2.3. Subversion in Action ...................................................................................................... 11 2.3.1. Working Copies .................................................................................................. 11 2.3.2. Repository URLs ................................................................................................. 12 2.3.3. Revisions ........................................................................................................... 13 2.3.4. How Working Copies Track the Repository ............................................................. 15 2.4. Summary ...................................................................................................................... 15 3. The Repository ........................................................................................................................ 16 3.1. Repository Creation ........................................................................................................ 16 3.1.1. Creating a Repository with the Command Line Client ................................................ 16 3.1.2. Creating The Repository With TortoiseSVN ............................................................. 16 3.1.3. Local Access to the Repository .............................................................................. 17 3.1.4. Accessing a Repository on a Network Share ............................................................ 17 3.1.5. Repository Layout ............................................................................................... 17 3.2. Repository Backup ......................................................................................................... 19 3.3. Server side hook scripts .................................................................................................. 19 3.4. Checkout Links ............................................................................................................. 20 3.5. Accessing the Repository ................................................................................................ 20 4. Daily Use Guide ...................................................................................................................... 22 4.1. General Features ............................................................................................................ 22 4.1.1. Icon Overlays ..................................................................................................... 22 4.1.2. Context Menus ................................................................................................... 22 4.1.3. Drag and Drop .................................................................................................... 24 4.1.4. Common Shortcuts .............................................................................................. 25 4.1.5. Authentication .................................................................................................... 25 4.1.6. Maximizing Windows .......................................................................................... 26 iii TortoiseSVN 4.2. Importing Data Into A Repository .................................................................................... 26 4.2.1. Import ............................................................................................................... 26 4.2.2. Import in Place ................................................................................................... 27 4.2.3. Special Files ....................................................................................................... 28 4.3. Checking Out A Working Copy ....................................................................................... 28 4.3.1. Checkout Depth .................................................................................................. 29 4.4. Committing Your Changes To The Repository .................................................................... 31 4.4.1. The Commit Dialog ............................................................................................. 31 4.4.2. Change Lists ...................................................................................................... 34 4.4.3. Commit only parts of files .................................................................................... 34 4.4.4. Excluding Items from the Commit List ................................................................... 35 4.4.5. Commit Log Messages ......................................................................................... 35 4.4.6. Commit Progress ................................................................................................. 36 4.5. Update Your Working Copy With Changes From Others ...................................................... 37 4.6. Resolving Conflicts ........................................................................................................ 39 4.6.1. File Conflicts ...................................................................................................... 39 4.6.2. Property Conflicts ............................................................................................... 40 4.6.3. Tree Conflicts ..................................................................................................... 40 4.7. Getting Status Information .............................................................................................