Chapter 3. Guided Tour

Table of Contents

Help!
Import
Mirror
Revisions: Numbers, Keywords, and Dates, Oh My!
Revision Numbers
Revision Keywords
Revision Dates
Initial Checkout
Basic Work Cycle
Update Your Working Copy
Make Changes to Your Working Copy
Examine Your Changes
svk status
svk diff
svk revert
Resolve Conflicts (Merging Others' Changes)
Merging Conflicts by Hand
Resolving the changes
Discarding Your Changes
Discarding Changes Coming From the Depot
Punting: Using svk revert
Commit Your Changes
Examining History
svk log
svk diff
Examining Local Changes
Comparing Working Copy to Repository
Comparing Repository to Repository
svk cat
svk list
A Final Word on History
Other Useful Commands
svk cleanup
svk import
Summary

Now we will go into the details of using SVK. By the time you reach the end of this chapter, you will be able to perform almost all the tasks you need to use SVK in a normal day's work. You'll start with an initial checkout of your code, and walk through making changes and examining those changes. You'll also see how to bring changes made by others into your working copy, examine them, and work through any conflicts that might arise.

Note that this chapter is not meant to be an exhaustive list of all SVK's commands—rather, it's a conversational introduction to the most common SVK tasks you'll encounter. This chapter assumes that you've read and understood Chapter 2, Basic Concepts and are familiar with the general model of SVK. For a complete reference of all commands, see Chapter 9, SVK Complete Reference.

Help!

Before reading on, here is the most important command you'll ever need when using SVK: svk help. The SVK command-line client is self-documenting—at any time, a quick svk help <subcommand> will describe the syntax, switches, and behavior of the subcommand.