1 In addition to the generic version control objectives and points.
9 * Explain why working copies of different projects should not overlap.
14 * The master copy is stored in a repository.
15 * Nobody ever edits the master directory: instead, each person edits a
17 * The basic workflow for version control is update-change-commit.
18 * `svn add <em>things</em>` tells Subversion to start managing
19 particular files or directories.
20 * `svn checkout $URL` checks out a working copy of a repository.
21 * `svn commit -m "$MESSAGE" $THINGS` sends changes to the repository.
22 * `svn diff` compares the current state of a working copy to the state
23 after the most recent update.
24 * `svn diff -r HEAD` compares the current state of a working copy to
25 the state of the master copy.
26 * `svn history` shows the history of a working copy.
27 * `svn status` shows the status of a working copy.
28 * `svn update` updates a working copy from the repository.
36 * Identify the auxiliary files created when a conflict occurs.
41 * For each conflicted file, Subversion creates auxiliary files
42 containing the common parent, the master version, and the local
44 * `svn resolve $FILES` tells Subversion that conflicts have been
47 Recovering old versions
48 =======================
53 * Old versions of files can be recovered by merging their old state
54 with their current state.
55 * Recovering an old version of a file does not erase the intervening
57 * `svn revert` undoes local changes to files.
58 * `svn merge` merges two revisions of a file.
60 Setting up a repository
61 =======================
66 * `svnadmin create $NAME` creates a new repository.
74 * `$Keyword: …$` in a file can be filled in with a property value each
75 time the file is committed.
76 * `svn propset svn:keywords $PROPERTY $FILES` tells Subversion to
77 start filling in property values.