[svnbook commit] r2964 - trunk/src/en/book
sussman
noreply at red-bean.com
Sat Jan 12 20:50:26 CST 2008
Author: sussman
Date: Sat Jan 12 20:50:23 2008
New Revision: 2964
Log:
* ch04-branching-and-merging.xml: output tweaks from Arfrever Frehtes Taifersar Arahesis <arfrever.fta at gmail.com>
Modified:
trunk/src/en/book/ch04-branching-and-merging.xml
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Sat Jan 12 20:50:23 2008
@@ -334,7 +334,7 @@
------------------------------------------------------------------------
r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
Changed paths:
- M /calc/trunk/integer.c
+ A /calc/trunk/integer.c
* integer.c: adding this file to the project.
@@ -372,7 +372,7 @@
------------------------------------------------------------------------
r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
Changed paths:
- M /calc/trunk/integer.c
+ A /calc/trunk/integer.c
* integer.c: adding this file to the project.
@@ -545,8 +545,8 @@
$ svn merge http://svn.example.com/repos/calc/trunk
--- Merging r345 through r356 into '.':
-U button.c
-U integer.c
+U button.c
+U integer.c
</screen>
<para>Your branch working copy now contains new local
@@ -556,8 +556,8 @@
<screen>
$ svn status
-M button.c
-M integer.c
+M button.c
+M integer.c
</screen>
<para>At this point, the wise thing to do is look at the changes
@@ -648,9 +648,9 @@
<screen>
$ svn merge http://svn.example.com/repos/calc/trunk
--- Merging r357 through r380 into '.':
-U integer.c
-U Makefile
-A README
+U integer.c
+U Makefile
+A README
</screen>
<para>Subversion knows which trunk changes you've already
@@ -669,8 +669,8 @@
<screen>
$ svn merge http://svn.example.com/repos/calc/trunk
--- Merging r381 through r385 into '.':
-U button.c
-U README
+U button.c
+U README
$ # build, test, ...
@@ -705,9 +705,9 @@
$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch
--- Merging r341 through r390 into '.':
-U button.c
-U integer.c
-U Makefile
+U button.c
+U integer.c
+U Makefile
$ # build, test, verify, ...
@@ -810,9 +810,10 @@
<screen>
$ svn mergeinfo .
Path: .
-Source path: /trunk
-Merged ranges: r341:390
-Eligible ranges: r391:395
+ Source path: /trunk
+ Merged ranges: r341:390
+ Eligible ranges: r391:395
+
</screen>
<para>The <command>svn mergeinfo</command> command, by default,
@@ -831,9 +832,10 @@
$ svn mergeinfo --from-source \
http://svn.example.com/repos/calc/branches/other-branch .
Path: .
-Source path: /branches/other-branch
-Merged ranges:
-Eligible ranges: r360:364
+ Source path: /branches/other-branch
+ Merged ranges:
+ Eligible ranges: r360:364
+
</screen>
<para>Another way to get a more precise preview of a merge
@@ -842,7 +844,7 @@
<screen>
$ svn merge http://svn.example.com/repos/calc/trunk --dry-run
-U integer.c
+U integer.c
$ svn status
# nothing printed, working copy is still unchanged.
@@ -965,10 +967,10 @@
<screen>
$ svn merge -c 355 http://svn.example.com/repos/calc/trunk
-U integer.c
+U integer.c
$ svn status
-M integer.c
+M integer.c
</screen>
<para>You can now go through the usual testing procedures before
@@ -993,11 +995,11 @@
$ svn merge http://svn.example.com/repos/calc/trunk
--- Merging r350 through r354 into '.':
-U integer.c
-U Makefile
+U integer.c
+U Makefile
--- Merging r356 through r360 into '.':
-U integer.c
-U button.c
+U integer.c
+U button.c
</screen>
<para>This use-case of replicating
@@ -1177,10 +1179,11 @@
<screen>
$ svn merge -c -303 http://svn.example.com/repos/calc/trunk
-U integer.c
+--- Reverse-merging r303 into 'integer.c':
+U integer.c
$ svn status
-M integer.c
+M integer.c
$ svn diff
…
@@ -1361,7 +1364,7 @@
$ svn cat http://svn.example.com/repos/calc/trunk/real.c@807 > ./real.c
$ svn add real.c
-A real.c
+A real.c
$ svn commit -m "Recreated real.c from revision 807."
Adding real.c
@@ -1381,7 +1384,7 @@
Committed revision 1390.
$ svn update
-A real.c
+A real.c
Updated to revision 1390.
</screen>
@@ -1424,11 +1427,11 @@
<screen>
$ svn merge -r 1288:1351 http://svn.example.com/repos/branch
-U foo.c
-U bar.c
+U foo.c
+U bar.c
Skipped missing target: 'baz.c'
-U glub.c
-U sputter.h
+U glub.c
+U sputter.h
Conflict discovered in 'glorb.h'.
Select: (p)ostpone, (d)iff, (e)dit, (h)elp for more options :
</screen>
@@ -1701,8 +1704,8 @@
indicate a deletion followed by an add:</para>
<screen>
- D foo.c
- A foo.c
+D foo.c
+A foo.c
</screen>
<para>Most merges involve comparing trees that are ancestrally
@@ -1769,11 +1772,11 @@
decide to merge your branch to the trunk:</para>
<screen>
- $ cd calc/trunk
+$ cd calc/trunk
- $ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch
- D integer.c
- A whole.c
+$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch
+D integer.c
+A whole.c
</screen>
<para>This doesn't look so bad at first glance, but it's also
@@ -1976,8 +1979,8 @@
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/newbranch
-Committed revision 353.
+Committed revision 353.
$ svn switch http://svn.example.com/repos/calc/branches/newbranch
At revision 353.
</screen>
@@ -2464,16 +2467,16 @@
back with the <option>--reintegrate</option> option:</para>
<screen>
- $ cd trunk-working-copy
+$ cd trunk-working-copy
- $ svn update
- At revision 1910.
+$ svn update
+At revision 1910.
- $ svn merge --reintegrate http://svn.example.com/repos/calc/branches/mybranch@1910
- U real.c
- U integer.c
- A newdirectory
- A newdirectory/newfile
+$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/mybranch@1910
+U real.c
+U integer.c
+A newdirectory
+A newdirectory/newfile
…
</screen>
More information about the svnbook-dev
mailing list