[svnbook] r4174 committed - * en/book/ch04-branching-and-merging.xml...

svnbook at googlecode.com svnbook at googlecode.com
Tue Nov 8 10:30:22 CST 2011


Revision: 4174
Author:   ptburba at gmail.com
Date:     Tue Nov  8 08:29:25 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.advanced.blockchanges): Some minor wording edits.
    Don't use rN shorthand in the main text body, say "revision N";
    this is more consistent with the rest of the chapter.

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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 08:17:31 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 08:29:25 2011
@@ -2211,16 +2211,16 @@
          single changesets from the trunk to the branch—just the
          changes that are stable enough to pass muster.  Maybe things
          aren't quite that strict, though; perhaps most of the time
-        you'd like to just let <command>svn merge</command>
+        you just let <command>svn merge</command>
          automatically merge most changes from trunk to branch.  In
-        this case, you'd like a way to mask a few specific changes
+        this case, you want a way to mask a few specific changes
          out, that is, prevent them from ever being automatically
          merged.</para>

        <para>Through Subversion 1.7, the only way to block a changeset
          is to make the system believe that the change has
          <emphasis>already</emphasis> been merged.  To do this, invoke
-        a merge command with the <option>--record-only</option>
+        the merge subcommand with the <option>--record-only</option>
          option:</para>

        <informalexample>
@@ -2255,7 +2255,7 @@
          <filename>^/trunk</filename> to our
          <filename>^/branches/proj-X</filename> branch.  We know that all
          the frazzle work was done on its own branch, which was
-        reintegrated to <filename>trunk</filename> in r1055:</para>
+        reintegrated to <filename>trunk</filename> in revision 1055:</para>

        <informalexample>
          <screen>
@@ -2270,8 +2270,8 @@
  </screen>
        </informalexample>

-      <para>Because r1055 was a reintegrate merge we know that mergeinfo
-        was recorded describing the merge:</para>
+      <para>Because revision 1055 was a reintegrate merge we know
+        that mergeinfo was recorded describing the merge:</para>

        <informalexample>
          <screen>
@@ -2288,16 +2288,16 @@
  </screen>
        </informalexample>

-      <para>Now simply blocking merges of r1055 from
+      <para>Now simply blocking merges of revision 1055 from
          <filename>^/trunk</filename> isn't foolproof since someone could
          merge r996:1003 directly from
          <filename>^/branches/frazzle-feature-branch</filename>.
          Fortunately the transitive nature of <option>--record-only</option>
          merges in 1.7 prevents this; the <option>--record-only</option>
          merge applies the <literal>svn:mergeinfo</literal> diff from
-        r1055, thus blocking merges directly from the frazzle branch
+        revision 1055, thus blocking merges directly from the frazzle  
branch
          <emphasis>and</emphasis> as it has always done prior to 1.7, it
-        blocks merges of r1055 directly from
+        blocks merges of revision 1055 directly from
          <filename>^/trunk</filename>:</para>

        <informalexample>




More information about the svnbook-dev mailing list