Table of Contents

1. Getting Started

What is CVS?

What is TortoiseCVS?

Where to Begin?

2. Basic Usage of TortoiseCVS

Sandboxes

Checking out a Module

Windows Explorer and TortoiseCVS

Total Commander and TortoiseCVS

Updating your Sandbox

Committing your Changes to the Repository

Resolving Conflicts

Adding Files and Directories to the Repository

3. Advanced Usage of TortoiseCVS

Creating a New Repository or Module

Watch, Edit and Unedit

Tagging and Labeling

Reverting to an Older Version of a File

Branching And Merging

Creating a Branch

Selecting a Branch to Work On

Merging from a Branch

Going Back to the Head Branch

Binary and Unicode Detection

File Revision History

History Dialog

Revision Graph Dialog

Web Log

Making a Patch File

4. Customizing TortoiseCVS

Overlay Icons

Selecting a Different Set of Overlay Icons

Changing how the Overlay Icons Work

5. Command Reference for TortoiseCVS

Installing TortoiseCVS

Obtaining a Working Copy: CVS Checkout...

Getting Other People's Changes: CVS Update

CVS Update Special...

Making Your Changes Available to Others: CVS Commit...

Adding New Files: CVS Add and CVS Add Contents...

Discarding Obsolete Files: CVS Remove

Finding Out What Has Changed: CVS Diff...

Making a Snapshot: CVS Tag...

Lines of Development: CVS Branch...

CVS Merge...

CVS Make New Module

Watching And Locking

Finding Out Who to Blame: CVS Annotate

Showing More Information: CVS Explorer Columns

Keyboard Shortcuts

How Web Log Autodetects the Server URL

6. Dialog Reference for TortoiseCVS

Add Dialog

Checkout Dialog

Update Special Dialog

Commit Dialog

Branch Dialog

Make New Module Dialog

Progress Dialog

Tag Dialog

Preferences Dialog

Merge Dialog

History Dialog

Revision Graph Dialog

About Dialog

7. Articles, Tips and Tricks

Using TortoiseCVS with SourceForge

How CVS Differs from Microsoft Visual Source Safe

Creating new icons for TortoiseCVS

Creating a new locale (translation) for TortoiseCVS

Using PuTTY sessions

Using Pageant to avoid having to enter the SSH password every time

8. Resources

List of Figures

2.1. Checkout Dialog

2.2. TortoiseCVS and Windows Explorer

2.3. Updating Files and Folders

2.4. Commit Dialog

2.5. Resolve Conflicts Dialog

2.6. Add Dialog

2.7. Add Contents Dialog

3.1. Make New Module Dialog

3.2. Make New Repository Question

3.3. Tag Dialog

3.4. Branch Dialog

3.5. Update Special Dialog

3.6. Merge Dialog

3.7. History Dialog

3.8. Revision Graph Dialog

3.9. Web Log Dialog

5.1. Annotate Dialog

5.2. Choosing which columns to display

6.1. Add Dialog

6.2. Checkout Dialog - Module Tab

6.3. Checkout Dialog - Revision Tab

6.4. Checkout Dialog - Options Tab

6.5. Update Special Dialog

6.6. Commit Dialog

6.7. Progress Dialog

6.8. Tag Dialog

6.9. Preferences Dialog - Main Tab

6.10. Preferences Dialog - Policy Tab

6.11. Preferences Dialog - Tools Tab

6.12. Preferences Dialog - Advanced Tab

6.13. Preferences Dialog - Appearance Tab

6.14. Preferences Dialog - Cache Tab

6.15. Preferences Dialog - Ignored Files Tab

6.16. Preferences Dialog - Iconset Chooser

6.17. History Dialog

6.18. Revision Graph Dialog

6.19. About Dialog

List of Tables

2.1. Icon Overlays

2.2. Right-Click Context