[svnbook] r4126 committed - Apply 1.7-style notifications to all 'svn merge' examples....

svnbook at googlecode.com svnbook at googlecode.com
Fri Oct 28 15:31:17 CDT 2011


Revision: 4126
Author:   ptburba at gmail.com
Date:     Fri Oct 28 13:30:53 2011
Log:      Apply 1.7-style notifications to all 'svn merge' examples.

* en/book/ch04-branching-and-merging.xml
* en/book/ch09-reference.xml

http://code.google.com/p/svnbook/source/detail?r=4126

Modified:
  /trunk/en/book/ch04-branching-and-merging.xml
  /trunk/en/book/ch09-reference.xml

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Oct 28 09:32:25 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Fri Oct 28 13:30:53 2011
@@ -557,6 +557,8 @@
  --- Merging r345 through r356 into '.':
  U    button.c
  U    integer.c
+--- Recording mergeinfo for merge of r345 through r356 into '.':
+ U   .
  $
  </screen>
        </informalexample>
@@ -725,6 +727,8 @@
  U    integer.c
  U    Makefile
  A    README
+--- Recording mergeinfo for merge of r357 through r380 into '.':
+ U   .
  $
  </screen>
        </informalexample>
@@ -754,6 +758,8 @@
  --- Merging r381 through r385 into '.':
  U    button.c
  U    README
+--- Recording mergeinfo for merge of r381 through r385 into '.':
+ U   .

  $ # build, test, ...

@@ -798,6 +804,7 @@
  U    button.c
  U    integer.c
  U    Makefile
+--- Recording mergeinfo for merge between repository URLs into '.':
   U   .

  $ # build, test, verify, ...
@@ -997,6 +1004,7 @@
        <informalexample>
          <screen>
  $ svn merge ^/calc/trunk --dry-run
+--- Merging r391 through r395 into 'branch':
  U    integer.c

  $ svn status
@@ -1080,6 +1088,8 @@
  $ svn merge -c -303 ^/calc/trunk
  --- Reverse-merging r303 into 'integer.c':
  U    integer.c
+--- Recording mergeinfo for reverse merge of r303 into 'integer.c':
+ U   A-branch

  $ svn status
   M      .
@@ -1372,6 +1382,8 @@
  $ svn merge -c 355 ^/calc/trunk
  --- Merging r355 into '.':
  U    integer.c
+--- Recording mergeinfo for merge of r355 into '.':
+ U   .

  $ svn status
  M       integer.c
@@ -1416,6 +1428,8 @@
   U   .
  U    integer.c
  U    button.c
+--- Recording mergeinfo for merge of r350 through r360 into '.':
+ U   .
  </screen>
        </informalexample>

@@ -1858,6 +1872,8 @@

  # Let's make the metadata list r3328 as already merged.
  $ svn merge -c 3328 --record-only ^/calc/trunk
+--- Recording mergeinfo for merge of r3328 into '.':
+ U   .

  $ svn status
  M       .
@@ -1945,6 +1961,8 @@
  Updating '.':
  Updated to revision 393.
  $ 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."
  Sending        .

@@ -2224,9 +2242,11 @@

  $ svn merge --reintegrate ^/calc/branches/my-calc-branch
  --- Merging differences between repository URLs into '.':
-D   integer.c
-A   whole.c
-U   .
+D    integer.c
+A    whole.c
+U    .
+--- Recording mergeinfo for merge between repository URLs into '.':
+ U   .
  </screen>
        </informalexample>

=======================================
--- /trunk/en/book/ch09-reference.xml	Thu Sep  8 11:55:17 2011
+++ /trunk/en/book/ch09-reference.xml	Fri Oct 28 13:30:53 2011
@@ -3446,6 +3446,8 @@
  U    integer.c
  U    Makefile
   U   .
+--- Recording mergeinfo for merge between repository URLs into '.':
+ U   .

  $ # build, test, verify, ...

@@ -3464,8 +3466,12 @@
          <informalexample>
            <screen>
  $ cd myproj
-$ svn merge -r 30:31 thhgttg.txt
-U  thhgttg.txt
+            U    thhgttg.txt
+$ svn merge -c 31 ^/trunk/thhgttg.txt thhgttg.txt
+--- Merging r31 into 'thhgttg.txt':
+U    thhgttg.txt
+--- Recording mergeinfo for merge of r31 into 'thhgttg.txt':
+ U   thhgttg.txt
  </screen>
          </informalexample>





More information about the svnbook-dev mailing list