Version Control with Subversion - Electrical and Computer ...

Guided Tour
In this case, someone else checked in modifications to both foo.c and bar.c since the last time you
updated, and Subversion has updated your working copy to include those changes.
Let's examine the output of svn update a bit more. When the server sends changes to your working
copy, a letter code is displayed next to each item to let you know what actions Subversion performed to
bring your working copy up-to-date:
U foo
File foo was Updated (received changes from the server).
A foo
File or directory foo was Added to your working copy.
D foo
File or directory foo was Deleted from your working copy.
R foo
File or directory foo was Replaced in your working copy; that is, foo was deleted, and a new item with the
same name was added. While they may have the same name, the repository considers them to be distinct objects
with distinct histories.
G foo
File foo received new changes from the repository, but your local copy of the file had your modifications.
Either the changes did not intersect, or the changes were exactly the same as your local modifications, so Subversion
has successfully merGed the repository's changes into the file without a problem.
C foo
File foo received Conflicting changes from the server. The changes from the server directly overlap your own
changes to the file. No need to panic, though. This overlap needs to be resolved by a human (you); we discuss
this situation later in this chapter.
Make Changes to Your Working Copy
Now you can get to work and make changes in your working copy. It's usually most convenient to decide
on a particular change (or set of changes) to make, such as writing a new feature, fixing a bug, etc.
The Subversion commands that you will use here are svn add, svn delete, svn copy, and svn move.
However, if you are merely editing files that are already in Subversion, you may not need to use any of
these commands until you commit. Changes you can make to your working copy:
File changes
This is the simplest sort of change. You don't need to tell Subversion that you intend to change a file; just make
your changes. Subversion will be able to automatically detect which files have been changed.
Tree changes
You can ask Subversion to “mark” files and directories for scheduled removal, addition, copying, or moving.
While these changes may take place immediately in your working copy, no additions or removals will happen in
the repository until you commit them.
To make file changes, use your text editor, word processor, graphics program, or whatever tool you
would normally use. Subversion handles binary files just as easily as it handles text files—and just as efficiently
too.
26