[svnbook] r3777 committed - Fix issue 97 ("^URL syntax usage in some sections does not fit the...
svnbook at googlecode.com
svnbook at googlecode.com
Mon Sep 13 11:47:00 CDT 2010
Revision: 3777
Author: cmpilato at gmail.com
Date: Mon Sep 13 09:45:05 2010
Log: Fix issue 97 ("^URL syntax usage in some sections does not fit the
repository layout").
* src/en/book/ch04-branching-and-merging.xml
Re-add "/calc" to the front of the appropriate URL shortcuts, and
expand one example that uses a totally different repository (for some
reason...) back out to a full URL.
http://code.google.com/p/svnbook/source/detail?r=3777
Modified:
/trunk/src/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml Tue Sep 7 08:57:49
2010
+++ /trunk/src/en/book/ch04-branching-and-merging.xml Mon Sep 13 09:45:05
2010
@@ -542,7 +542,7 @@
$ pwd
/home/user/my-calc-branch
-$ svn merge ^/trunk
+$ svn merge ^/calc/trunk
--- Merging r345 through r356 into '.':
U button.c
U integer.c
@@ -620,7 +620,7 @@
<screen>
$ cd my-calc-branch
-$ svn diff -r 341:HEAD ^/trunk > patchfile
+$ svn diff -r 341:HEAD ^/calc/trunk > patchfile
$ patch -p0 < patchfile
Patching file integer.c using Plan A...
Hunk #1 succeeded at 147.
@@ -667,7 +667,7 @@
again!</para>
<screen>
-$ svn merge ^/trunk
+$ svn merge ^/calc/trunk
--- Merging r357 through r380 into '.':
U integer.c
U Makefile
@@ -694,7 +694,7 @@
doing all along:</para>
<screen>
-$ svn merge ^/trunk
+$ svn merge ^/calc/trunk
--- Merging r381 through r385 into '.':
U button.c
U README
@@ -736,7 +736,7 @@
$ svn update # (make sure the working copy is up to date)
At revision 390.
-$ svn merge --reintegrate ^/branches/my-calc-branch
+$ svn merge --reintegrate ^/calc/branches/my-calc-branch
--- Merging differences between repository URLs into '.':
U button.c
U integer.c
@@ -788,7 +788,7 @@
wish to remove it from the repository:</para>
<screen>
-$ svn delete ^/branches/my-calc-branch \
+$ svn delete ^/calc/branches/my-calc-branch \
-m "Remove my-calc-branch."
Committed revision 392.
</screen>
@@ -825,7 +825,7 @@
$ cd my-calc-branch
-$ svn switch ^/branches/new-branch
+$ svn switch ^/calc/branches/new-branch
Updated to revision 393.
</screen>
@@ -883,7 +883,7 @@
$ cd my-calc-branch
# Which changes have already been merged from trunk to branch?
-$ svn mergeinfo ^/trunk
+$ svn mergeinfo ^/calc/trunk
r341
r342
r343
@@ -893,7 +893,7 @@
r390
# Which changes are still eligible to merge from trunk to branch?
-$ svn mergeinfo ^/trunk --show-revs eligible
+$ svn mergeinfo ^/calc/trunk --show-revs eligible
r391
r392
r393
@@ -916,7 +916,7 @@
option:</para>
<screen>
-$ svn merge ^/trunk --dry-run
+$ svn merge ^/calc/trunk --dry-run
U integer.c
$ svn status
@@ -993,7 +993,7 @@
<screen>
-$ svn merge -c -303 ^/trunk
+$ svn merge -c -303 ^/calc/trunk
--- Reverse-merging r303 into 'integer.c':
U integer.c
@@ -1151,7 +1151,7 @@
repository to your working copy:</para>
<screen>
-$ svn copy ^/trunk/real.c at 807 ./real.c
+$ svn copy ^/calc/trunk/real.c at 807 ./real.c
$ svn status
A + real.c
@@ -1177,7 +1177,7 @@
works just as well:</para>
<screen>
-$ svn cat ^/trunk/real.c at 807 > ./real.c
+$ svn cat ^/calc/trunk/real.c at 807 > ./real.c
$ svn add real.c
A real.c
@@ -1195,7 +1195,7 @@
entirely in the repository:</para>
<screen>
-$ svn copy ^/trunk/real.c at 807 ^/trunk/ \
+$ svn copy ^/calc/trunk/real.c at 807 ^/calc/trunk/ \
-m "Resurrect real.c from revision 807."
Committed revision 1390.
@@ -1254,7 +1254,7 @@
your work.</para>
<screen>
-$ svn diff -c 355 ^/trunk
+$ svn diff -c 355 ^/calc/trunk
Index: integer.c
===================================================================
@@ -1276,7 +1276,7 @@
to <command>svn merge</command>:</para>
<screen>
-$ svn merge -c 355 ^/trunk
+$ svn merge -c 355 ^/calc/trunk
U integer.c
$ svn status
@@ -1299,7 +1299,7 @@
# Notice that r355 isn't listed as "eligible" to merge, because
# it's already been merged.
-$ svn mergeinfo ^/trunk --show-revs eligible
+$ svn mergeinfo ^/calc/trunk --show-revs eligible
r350
r351
r352
@@ -1311,7 +1311,7 @@
r359
r360
-$ svn merge ^/trunk
+$ svn merge ^/calc/trunk
--- Merging r350 through r354 into '.':
U .
U integer.c
@@ -1416,7 +1416,7 @@
following:</para>
<screen>
-$ svn merge ^/branches/some-branch
+$ svn merge ^/calc/branches/some-branch
</screen>
<para>will attempt to duplicate any changes made
@@ -1604,7 +1604,7 @@
targets</quote>:</para>
<screen>
-$ svn merge -r 1288:1351 ^/branches/mybranch
+$ svn merge -r 1288:1351 http://svn.example.com/myrepos/branch
U foo.c
U bar.c
Skipped missing target: 'baz.c'
@@ -1692,7 +1692,7 @@
/trunk:1680-3305
# Let's make the metadata list r3328 as already merged.
-$ svn merge -c 3328 --record-only ^/trunk
+$ svn merge -c 3328 --record-only ^/calc/trunk
$ svn status
M .
@@ -1776,7 +1776,7 @@
$ cd my-calc-branch
$ svn update
Updated to revision 393.
-$ svn merge --record-only -c 391 ^/trunk
+$ svn merge --record-only -c 391 ^/calc/trunk
--- Recording mergeinfo for merge of r391 into '.':
U .
$ svn commit -m "Block revision 391 from being merged into my-calc-branch."
@@ -2043,7 +2043,7 @@
<screen>
$ cd calc/trunk
-$ svn merge --reintegrate ^/branches/my-calc-branch
+$ svn merge --reintegrate ^/calc/branches/my-calc-branch
--- Merging differences between repository URLs into '.':
D integer.c
A whole.c
@@ -2206,7 +2206,7 @@
$ svn info | grep URL
URL: http://svn.example.com/repos/calc/trunk
-$ svn switch ^/branches/my-calc-branch
+$ svn switch ^/calc/branches/my-calc-branch
U integer.c
U button.c
U Makefile
@@ -2331,7 +2331,7 @@
http://svn.example.com/repos/calc/branches/newbranch \
-m "Create branch 'newbranch'."
Committed revision 353.
-$ svn switch ^/branches/newbranch
+$ svn switch ^/calc/branches/newbranch
At revision 353.
</screen>
@@ -2826,7 +2826,7 @@
$ svn update
At revision 1910.
-$ svn merge --reintegrate ^/branches/mybranch
+$ svn merge --reintegrate ^/calc/branches/mybranch
--- Merging differences between repository URLs into '.':
U real.c
U integer.c
More information about the svnbook-dev
mailing list