1 ope. TortoiseSVN 1.7. Beginner's Guide. Perform version control in the easiest way with the. Lesley Harrison. best SVN client-tortoisesvn

Transcription

1 TortoiseSVN 1.7 Beginner's Guide Perform version control in the easiest way with the best SVN clienttortoisesvn Lesley Harrison PUBLISHING 1 ope I n source community experience distilled BIRMINGHAM MUMBAI

2 installing adding setting setting installing Preface 1 Chapter 1: Setting up TortoiseSVN 9 Choosing your TortoiseSVN version 10 Checking your operating system edition 10 checking Windows Vista / 7's architecture 10 checking Windows XP's architecture 11 checking Windows Server 2003 architecture 12 Installing TortoiseSVN 14 TortoiseSVN 14 Language packs and spellchecking 20 new spellchecking dictionaries 21 Creating a repository 21 creating a repository 22 testing your repository 24 Setting up the SVNServe server 25 up SVNServe 26 Simple authentication for SVNserve 28 up simple authentication for SVNserve 28 Setting up an Apache + Subversion server 29 VisualSVN 30 installing Apache 32 installing Subversion 34 Summary 37 Chapter 2: Getting Started With TortoiseSVN 39 Our case study 39 Working copies explained 40 checking out a copy 40 Checkout depth 43

3 local local local committing stealing releasing using checkout depth 43 Committing changes to a repository 46 changes to a repository 46 The importance of commit log messages 50 Excluding items from a commit 52 excluding files that are already versioned 52 temporarily excluding files from committing 53 using the global ignore list 55 Keeping your copy uptodate 56 updating your copy 56 Using the repository browser 58 using the repository browser 58 Summary 60 Chapter 3: Creating and Applying Patches 63 Why use patching? 63 How to create a patch 66 creating a patch 66 Applying a patch 69 applying a patch 69 Tracking changes with Blame 73 using Blame to track changes 74 using the log 77 Working with statistics 79 viewing statistics 80 Summary 82 Chapter 4: Status Information and Conflict Management 85 File statuses 86 File locking 87 Time for action setting the needslock property 88 locking a file 90 Stealing a lock 92 a lock 93 a lock 95 Resolving conflicts 97 Scenario 1 edit, incoming edit 97 Scenario 2 local edit, incoming delete 98 Scenario 3 Scenario 4 delete, incoming edit 101 delete, incoming delete 102 Summary 103

4 Local Local switching reverting reverting viewing Chapter 5: Branching and merging 105 What is a branch? 106 What is a tag? 106 Why use branching? 106 Common branch types 107 Branching on new releases 107 Branching on promotion 108 Branching per task 108 Branching components 109 A branch for each platform 109 Common branching pitfalls 110 Creating a branch 111 creating a branch 112 Tagging and selecting revisions 114 Switching your copy 114 your copy 115 Reverting changes 116 changes in your copy 116 more changes 117 Merging 119 merging merging one branch 120 two trees 126 Undoing changes with reverse differences 128 Resolving conflicts on merging 128 Scenario 1 missing, incoming edit 129 Scenario 2 edit, incoming missing 129 Scenario 3 Local delete, incoming delete 129 Tracking merges 130 Summary 131 Chapter 6: Working with Revision Logs 133 Differences in detail 133 Viewing differences between versions of a specific file in your copy 134 viewing differences in a copy 134 Viewing differences between files outside your copy 136 differences in files outside your copy 137 Comparing folders in the repository browser 140 Working with changelists 140 with changelists 142 Removing a file from a changelist 144 Ignoring files on commit 144 Working with revision graphs 145

5 exporting exporting removing relocating changing exporting rightclick Table ofcontents viewing a revision graph 145 Changing your view 151 Pruning trees 154 Summary 155 Chapter 7: Exporting and Relocating Working Copies 157 Working with a copy 157 Exporting a copy 159 a copy 159 Exporting from a repository using a URL 161 from a URL 161 Removing an existing copy from version control 163 removing an existing copy from version control 163 Another way to remove a copy from version control 163 a copy from version control 164 Relocating your copy 166 your copy 166 Recovering from a corrupt copy 169 Deleting a copy 169 Working copy cleanup 169 executing a copy cleanup 170 Troubleshooting copy problems 171 Folders have a red exclamation mark, despite nothing having changed 171 Certain context menus are missing from inside my copy 172 Access denied errors 172 Changing the case of a file name doesn't work 172 the case of a file name 173 My computer becomes sluggish when I on a file 174 Summary 176 Chapter 8: Keyword Substitution with SubWCRev 177 Why use SubWCRev? 177 Using SubWCRev via the command line 178 a copy 178 Commandline switches 181 Keyword substitution switches 182 Mixed revisions, modifications, and status 183 Setting a custom date format 183 Using the COM interface 184 Using SubWCRev as a prebuild event in your IDE 186 prebuild events in Visual Studio 186 C++ applications 186

6 prebuild prebuild build integration Jira setting creating events in Visual Studio C# applications 188 events in Visual Studio VB applications 189 events in Eclipse 193 Using prebuild events with other IDEs 193 Summary 194 Chapter 9: Using TortoiseSVN with Bug Tracking Systems 195 Why use bug trackers? 196 Why integrate with bug trackers? 198 Integration with Google Code 199 using TortoiseSVN with Google Code 200 Integration with Trac 203 with Trac 203 Integration with Redmine 205 Integratation with Jira 206 and TortoiseSVN integration 206 Working with other issue trackers 207 Properties for hook scripts 208 Summary 211 Chapter 10: Using SSL with TortoiseSVN 211 What are SSH and SSL? 213 Installing VisualSVN Server for Windows 214 up VisualSVN Server 214 Using VisualSVN Server 216 Working with OpenSSH certificates 220 Creating your public and private key pairs 220 public and private key pairs 221 Using Pageant to store connection details 226 Using precommit hooks 227 using a precommit hook in TortoiseSVN 227 Summary 229 Appendix A: Commandline Reference 231 Getting the commandline tools 231 Subversion's components 232 Protocols supported by Subversion 232 Subversion commandline reference 232 Getting help 232 Working with copies 233 Arguments for commands 234 Properties and statuses 234

7 subversion revision getting keyword Gurtle regular public Appendix B: Pop Quiz Answers 235 Chapter 1: Setting up TortoiseSVN 235 Pop quiz concepts 235 Chapter 2: Getting Started with TortoiseSVN 235 Pop quiz with TortoiseSVN 235 Chapter 3: Creating and Applying Patches 236 Pop quiz with TortoiseSVN 236 Chapter 4: Status Information and Conflict Management 236 Pop quiz with TortoiseSVN 236 Chapter 5: Branching and Merging 236 Pop quiz with TortoiseSVN 236 Chapter 6: Working with Revision Logs 236 Pop quiz 1 Pop quiz 2 graphs 236 with your view 237 Chapter 7: Exporting and relocating Working Copies 237 Pop quiz with your copy 237 Chapter 8: Keyword Substitution with SubWCRev 237 Pop quiz 1 to grips with SubWCRev 237 Pop quiz 2 substitution switches 237 Chapter 9: Using TortoiseSVN with Bug Tracking Systems 237 Pop quiz 1 and Google Code 237 Pop quiz 2 expressions 238 Chapter 10: Using SSH with TortoiseSVN 238 Pop quiz 1all about SSH 238 Pop quiz 2 keys and private keys 238 Index 237