
This is the Title of the Book, eMatter Edition
Copyright © 2007 O’Reilly & Associates, Inc. All rights reserved.
Copying Changes Between Branches
|
55
------------------------------------------------------------------------
r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines
Changed paths:
M /calc/trunk/integer.c
* integer.c: changed a docstring.
------------------------------------------------------------------------
r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
Changed paths:
M /calc/trunk/integer.c
* integer.c: adding this file to the project.
------------------------------------------------------------------------
Sally sees her own revision 344 change, but not the change you made in revision 343.
As far as Subversion is concerned, these two commits affected different files in differ-
ent repository locations. However, Subversion does show that the two files share a
common history. Before the branch-copy was made in revision 341, they used to be
the same file. That’s why you and Sally both see the changes made in revisions 303
and 98.
The Key Concepts Behind Branches
The two important lessons that you should remember from this section are as follows.
1. Unlike many other version control systems, Subversion’s branches exist as nor-
mal filesystem directories in the repository, not in an extra dimension. These
directories just happen to carry some extra historical ...