Table of Contents
- Preface
- 1. Getting Started
- 2. Basic Version-Control Concepts
- 3. The Repository
- 4. Daily Use Guide
-
- 4.1. General Features
- 4.2. Importing Data Into A Repository
- 4.3. Checking Out A Working Copy
- 4.4. Committing Your Changes To The Repository
- 4.5. Update Your Working Copy With Changes From Others
- 4.6. Resolving Conflicts
-
- 4.6.1. File Conflicts
- 4.6.2. Property Conflicts
- 4.6.3. Tree Conflicts
-
- 4.6.3.1. Local delete, incoming edit upon update
- 4.6.3.2. Local edit, incoming delete upon update
- 4.6.3.3. Local delete, incoming delete upon update
- 4.6.3.4. Local missing, incoming edit upon merge
- 4.6.3.5. Local edit, incoming delete upon merge
- 4.6.3.6. Local delete, incoming delete upon merge
- 4.6.3.7. Other tree conflicts
- 4.7. Getting Status Information
- 4.8. Change Lists
- 4.9. Revision Log Dialog
-
- 4.9.1. Invoking the Revision Log Dialog
- 4.9.2. Revision Log Actions
- 4.9.3. Getting Additional Information
- 4.9.4. Getting more log messages
- 4.9.5. Current Working Copy Revision
- 4.9.6. Merge Tracking Features
- 4.9.7. Changing the Log Message and Author
- 4.9.8. Filtering Log Messages
- 4.9.9. Statistical Information
- 4.9.10. Offline Mode
- 4.9.11. Refreshing the View
- 4.10. Viewing Differences
- 4.11. Adding New Files And Directories
- 4.12. Copying/Moving/Renaming Files and Folders
- 4.13. Ignoring Files And Directories
- 4.14. Deleting, Moving and Renaming
- 4.15. Undo Changes
- 4.16. Cleanup
- 4.17. Project Settings
- 4.18. External Items
- 4.19. Branching / Tagging
- 4.20. Merging
- 4.21. Locking
- 4.22. Creating and Applying Patches
- 4.23. Who Changed Which Line?
- 4.24. The Repository Browser
- 4.25. Revision Graphs
- 4.26. Exporting a Subversion Working Copy
- 4.27. Relocating a working copy
- 4.28. Integration with Bug Tracking Systems / Issue Trackers
- 4.29. Integration with Web-based Repository Viewers
- 4.30. TortoiseSVN's Settings
-
- 4.30.1. General Settings
- 4.30.2. Revision Graph Settings
- 4.30.3. Icon Overlay Settings
- 4.30.4. Network Settings
- 4.30.5. External Program Settings
- 4.30.6. Saved Data Settings
- 4.30.7. Log Caching
- 4.30.8. Client Side Hook Scripts
- 4.30.9. TortoiseBlame Settings
- 4.30.10. TortoiseUDiff Settings
- 4.30.11. Exporting TSVN Settings
- 4.30.12. Advanced Settings
- 4.31. Final Step
- 5. Project Monitor
- 6. The SubWCRev Program
- 7. IBugtraqProvider interface
- A. Frequently Asked Questions (FAQ)
- B. How Do I...
-
- B.1. Move/copy a lot of files at once
- B.2. Force users to enter a log message
- B.3. Update selected files from the repository
- B.4. Roll back (Undo) revisions in the repository
- B.5. Compare two revisions of a file or folder
- B.6. Include a common sub-project
- B.7. Create a shortcut to a repository
- B.8. Ignore files which are already versioned
- B.9. Unversion a working copy
- B.10. Remove a working copy
- C. Useful Tips For Administrators
- D. Automating TortoiseSVN
- E. Command Line Interface Cross Reference
-
- E.1. Conventions and Basic Rules
- E.2. TortoiseSVN Commands
-
- E.2.1. Checkout
- E.2.2. Update
- E.2.3. Update to Revision
- E.2.4. Commit
- E.2.5. Diff
- E.2.6. Show Log
- E.2.7. Check for Modifications
- E.2.8. Revision Graph
- E.2.9. Repo Browser
- E.2.10. Edit Conflicts
- E.2.11. Resolved
- E.2.12. Rename
- E.2.13. Delete
- E.2.14. Revert
- E.2.15. Cleanup
- E.2.16. Get Lock
- E.2.17. Release Lock
- E.2.18. Branch/Tag
- E.2.19. Switch
- E.2.20. Merge
- E.2.21. Export
- E.2.22. Relocate
- E.2.23. Create Repository Here
- E.2.24. Add
- E.2.25. Import
- E.2.26. Blame
- E.2.27. Add to Ignore List
- E.2.28. Create Patch
- E.2.29. Apply Patch
- F. Implementation Details
- G. Language Packs and Spell Checkers
- Glossary
- Index
List of Figures
- 1.1. The TortoiseSVN menu for unversioned folders
- 1.2. The Import dialog
- 1.3. File Difference Viewer
- 1.4. The Log Dialog
- 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. Explorer property page, Subversion tab
- 4.14. Check for Modifications
- 4.15. Commit dialog with Changelists
- 4.16. The Revision Log Dialog
- 4.17. The Revision Log Dialog Top Pane with Context Menu
- 4.18. The Code Collaborator Settings Dialog
- 4.19. Top Pane Context Menu for 2 Selected Revisions
- 4.20. The Log Dialog Bottom Pane with Context Menu
- 4.21. The Log Dialog Bottom Pane with Context Menu When Multiple Files Selected.
- 4.22. The Log Dialog Showing Merge Tracking Revisions
- 4.23. Commits-by-Author Histogram
- 4.24. Commits-by-Author Pie Chart
- 4.25. Commits-by-date Graph
- 4.26. Go Offline Dialog
- 4.27. The Compare Revisions Dialog
- 4.28. The image difference viewer
- 4.29. Explorer context menu for unversioned files
- 4.30. Right drag menu for a directory under version control
- 4.31. Explorer context menu for unversioned files
- 4.32. Explorer context menu for versioned files
- 4.33. Revert dialog
- 4.34. The Cleanup dialog
- 4.35. Subversion property page
- 4.36. Adding properties
- 4.37. Property dialog for hook scripts
- 4.38. Property dialog boolean user types
- 4.39. Property dialog state user types
- 4.40. Property dialog single-line user types
- 4.41. Property dialog multi-line user types
- 4.42. svn:externals property page
- 4.43. svn:keywords property page
- 4.44. svn:eol-style property page
- 4.45. tsvn:bugtraq property page
- 4.46. Size of log messages property page
- 4.47. Language property page
- 4.48. svn:mime-type property page
- 4.49. svn:needs-lock property page
- 4.50. svn:executable property page
- 4.51. Property dialog merge log message templates
- 4.52. The Branch/Tag Dialog
- 4.53. The Switch Dialog
- 4.54. The Merge Wizard - Select Revision Range
- 4.55. The Merge Wizard - Tree Merge
- 4.56. The Merge Conflict Callback Dialog
- 4.57. The Merge-All Dialog
- 4.58. The Locking Dialog
- 4.59. The Check for Modifications Dialog
- 4.60. The Create Patch dialog
- 4.61. The Annotate / Blame Dialog
- 4.62. TortoiseBlame
- 4.63. The Repository Browser
- 4.64. A Revision Graph
- 4.65. The Export-from-URL Dialog
- 4.66. The Relocate Dialog
- 4.67. The Bugtraq Properties Dialog
- 4.68. Example issue tracker query dialog
- 4.69. The Settings Dialog, General Page
- 4.70. The Settings Dialog, Context Menu Page
- 4.71. The Settings Dialog, Dialogs 1 Page
- 4.72. The Settings Dialog, Dialogs 2 Page
- 4.73. The Settings Dialog, Dialogs 3 Page
- 4.74. The Settings Dialog, Colours Page
- 4.75. The Settings Dialog, Revision Graph Page
- 4.76. The Settings Dialog, Revision Graph Colors Page
- 4.77. The Settings Dialog, Icon Overlays Page
- 4.78. The Settings Dialog, Icon Set Page
- 4.79. The Settings Dialog, Icon Handlers Page
- 4.80. The Settings Dialog, Network Page
- 4.81. The Settings Dialog, Diff Viewer Page
- 4.82. The Settings Dialog, Diff/Merge Advanced Dialog
- 4.83. The Settings Dialog, Saved Data Page
- 4.84. The Settings Dialog, Log Cache Page
- 4.85. The Settings Dialog, Log Cache Statistics
- 4.86. The Settings Dialog, Hook Scripts Page
- 4.87. The Settings Dialog, Configure Hook Scripts
- 4.88. The Settings Dialog, Issue Tracker Integration Page
- 4.89. The Settings Dialog, TortoiseBlame Page
- 4.90. The Settings Dialog, TortoiseUDiff Page
- 4.91. The Settings Dialog, Sync Page
- 4.92. Taskbar with default grouping
- 4.93. Taskbar with repository grouping
- 4.94. Taskbar with repository grouping
- 4.95. Taskbar grouping with repository color overlays
- 5.1. The edit project dialog of the project monitor
- 5.2. The main dialog of the project monitor
- C.1. The commit dialog, showing the upgrade notification
List of Tables
- 2.1. Repository Access URLs
- 4.1. Pinned Revision
- 6.1. List of available command line switches
- 6.2. List of SubWCRev error codes
- 6.3. List of available keywords
- 6.4. 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
- D.3. List of available options