O'Reilly logo

Version Control with Subversion, 2nd Edition by Brian W. Fitzpatrick, Ben Collins-Sussman, C. Michael Pilato

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Working with Your Branch

Now that you’ve created a branch of the project, you can check out a new working copy to start using it:

$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
A  my-calc-branch/Makefile
A  my-calc-branch/integer.c
A  my-calc-branch/button.c
Checked out revision 341.

There’s nothing special about this working copy; it simply mirrors a different directory in the repository. When you commit changes, however, Sally won’t see them when she updates, because her working copy is of /calc/trunk. (Be sure to read Traversing Branches; the svn switch command is an alternative way of creating a working copy of a branch.)

Let’s pretend that a week goes by, and the following commits happen:

  • You make a change to /calc/branches/my-calc-branch/button.c, which creates revision 342.

  • You make a change to /calc/branches/my-calc-branch/integer.c, which creates revision 343.

  • Sally makes a change to /calc/trunk/integer.c, which creates revision 344.

The branching of one file’s history
Figure 4-4. The branching of one file’s history

Now, two independent lines of development (shown in Figure 4-4) are happening on integer.c. Things get interesting when you look at the history of changes made to your copy of integer.c:

$ pwd /home/user/my-calc-branch $ svn log -v integer.c ------------------------------------------------------------------------ r343 | user | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required