Version Control with Subversion - Login

Branching and MergingChanged paths:A /calc/branches/my-calc-branch (from /calc/trunk:340)Creating a private branch of /calc/trunk.------------------------------------------------------------------------r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 linesChanged 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 linesChanged paths:A /calc/trunk/integer.c* integer.c: adding this file to the project.------------------------------------------------------------------------Notice that Subversion is tracing the history of your branch's integer.c all the way backthrough time, even traversing the point where it was copied. It shows the creation of thebranch as an event in the history, because integer.c was implicitly copied when all of /calc/trunk/ was copied. Now look at what happens when Sally runs the same commandon her copy of the file:$ pwd/home/sally/calc$ svn log -v integer.c------------------------------------------------------------------------r344 | sally | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 linesChanged paths:M /calc/trunk/integer.c* integer.c: fix a bunch of spelling errors.------------------------------------------------------------------------r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 linesChanged 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 linesChanged paths:A /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. Asfar as Subversion is concerned, these two commits affected different files in different repositorylocations. However, Subversion does show that the two files share a common history.Before the branch copy was made in revision 341, the files 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 BranchingYou should remember two important lessons from this section. First, Subversion has no in-90