| This_line_is_for_vim_user_only vim: sw=10 ts=10 Tortoise SVN Guidance 0. Brief This document is a simple guidance of Tortoise SVN. To make it short, Tortoise SVN is a Win32 GUI front-end of Subversion, which is a command line based version control software; however, unlike other Win32 GUI application, Tortoise SVN is shell based, which means it is well integrated with Windows Explore itself, so that use just need to apply operations by pop menus. The purpose of this document is to provide a quick reference about how to apply common operations by using Tortoise SVN. Because the manual of Tortoise SVN already has all topics covered - fully and nicely written - this document will not include screenshots and any further explanations about the mechanism of version control. This document is just - hopefully - to help users find their answers in a quickest way. To get detailed help about Tortoise SVN, check its user manual please. 1. Repository Creation 1.1. Create an empty folder, then enter it. 1.2. Right click -> Tortoise SVN -> Create repository here... 1.3. Select FS type (FSFS or BDB) and click 'OK'. FSFS is new, fast, but not that stable while BSB is old, slow, and stable. FSFS is the default setting of the newest version (1.4.3). 2. Password and Authorization 2.1. Set password and authorization: see the 'Svn Guidance' document please. 2.2. Gaint access: when 'Authorization' dialog appears, enter username and password, then click 'OK'. 3. Initial Import 3.1. Organize your directory structure, and delete all files that are not to be versioned, such as temporary or intermideate files. 3.2. Select the directory you want to import. 3.3. Right click -> Tortoise SVN -> Import... 3.4. Browse the repository. 3.5. Type import message. Click OK. 4. Checking Out 4.1. Right click -> SVN Checkout... 4.2. Browse the repository and checkout directory. 4.3. Select a revision (HEAD for the newest), and click 'OK'. 5. Make Your Working Directory Up To Date 5.1. Enter your working directory. 5.2. Check for modifications: Right click -> Tortoise SVN -> Check for modifications 5.3. Update working directory: Right click -> SVN Update 5.4. You can start resolving conflict by merging manually now. 5.5. If a file is in conflict status, 3 temporary files will be generated: 5.5.1. filename.ext.mine: your original file; 5.5.2. filename.ext.rOLDREV: the revision before your last update; 5.5.3. filename.ext.rNEWREV: the HEAD (newest) revision. 5.5.4. And the filename.ext contains merging information generated by svn, so that it will be easier to modify. 5.6. When conflict is resolved, remove the conflict status: Right click -> Tortoise SVN -> Resolved... 6. Commit Changes 6.1. Enter your working directory. 6.2. Right click -> SVN Commit... 6.3. Enter revision message, select files to be changed in the list, then click 'OK'. 6.4. You can view the difference of a certain file in the list by double click it, or 6.5. View difference in explorer: Right click -> Tortoise SVN -> Diff 7. Branching, Tagging & Merging 7.1. Enter your working directory. 7.2. Create a branch or tag: Right click -> Tortoise SVN -> Branch/tag... 7.3. Switch working copy: Right click -> Tortoise SVN -> Switch... 7.4. Merge between branches: Right click -> Tortoise SVN -> Merge... 7.5. Yes, that's all! Branching, tagging and merging are more concepts than skills. Check the policy document for more information. 8. Locking 8.1. Select the files and directories (actually, files in them) you want to perform operation. 8.2. Add lock: 8.2.1. Right click -> Tortoise SVN -> Get lock... 8.2.2. Add reason why you need to lock those files. This is only supported by SVNServe so far. 8.2.3. If you want to steal a lock, check the checkbox. 8.3. Release lock: Right click -> Tortoise SVN -> Release lock |