When we have finished our changes??”and checked them in!??”we need to merge them
back into the trunk. First we need to switch our working copy back to the trunk.
3. Type svn switch http://servername/svn/sandbox/trunk
and press Enter.
Now we need to determine which revisions we want to merge into the trunk.
4. Type:
svn log http://servername/svn/sandbox/branches/
mybranch --stop-on-copy
and press Enter.
This provides us with the log entries for our branch from the point it was created up
to its latest change.
$ svn log http://projects.example.com/svn/sandbox/branches/mybranch -
-stop-on-copy
----------------------------------------------------------------------
r5 | user@example.com | 2007-08-22 12:58:33 +0100 (Wed, 22 Aug 2007) |
1 line
Made greeting more polite
----------------------------------------------------------------------
r4 | user@example.com | 2007-08-22 12:52:57 +0100 (Wed, 22 Aug 2007) |
1 line
Created a branch
----------------------------------------------------------------------
From this we can see that we want to merge all changes between revision 4 and 5
(not a very complex branch).
5. Type:
svn merge -r4:5 http://servername/svn/sandbox/branches/mybranch
and press Enter.
Chapter 6
[ 71 ]
We now have the changes from our branch, but we need to check them in.
Pages:
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99