[svnbook] r3898 committed - Some issue #75 work ('ch04: svn merge --reintegrate does...
Paul Burba
ptburba at gmail.com
Fri Jul 8 12:28:39 CDT 2011
On Fri, Jul 8, 2011 at 12:34 PM, C. Michael Pilato
<cmpilato at red-bean.com> wrote:
> On 07/08/2011 11:28 AM, svnbook at googlecode.com wrote:
>> Modified:
>> /trunk/src/en/book/ch04-branching-and-merging.xml
>>
>> =======================================
>> --- /trunk/src/en/book/ch04-branching-and-merging.xml Thu Jul 7 13:03:29
>> 2011
>> +++ /trunk/src/en/book/ch04-branching-and-merging.xml Fri Jul 8 08:28:10
>> 2011
>> @@ -731,22 +731,20 @@
>
> [...]
>
>> + <para>Now, you use <command>svn merge</command> with the
>> + <option>--reintegrate</option> option to replicate your
>> + branch changes back into the trunk. You'll need a working
>> + copy of <filename>/trunk</filename>. You can do this by
>> + either doing an <command>svn checkout</command>, dredging up
>> + an old trunk working copy from somewhere on your disk, or
>> + using <command>svn switch</command>
>> + (see <xref linkend="svn.branchmerge.switchwc"/>.)
>
> The period and closing paren are transposed here.
Fixed that and a few other similar typos spread throughout the book in r3899.
>> + Your trunk working copy cannot have any local edits or be at
>> + mixed-revisions
>> + (see <xref linkend="svn.basic.in-action.mixedrevs"/>). While
>> + these are typically best practices for merging, they are
>> + <emphasis>required</emphasis> when using the
>> + <option>--reintegrate</option> option.</para>
>>
>> <para>Once you have a clean working copy of the trunk, you're
>> ready to merge your branch back into it:</para>
>> @@ -808,6 +806,19 @@
>> tree: the resulting difference is exactly your branch
>> changes!)</para>
>>
>> + <para>Keep in mind that the <option>--reintegrate</option> option
>> + is quite specialized in contrast to more general nature of most
>> + Subversion subcommand options. It supports the use case
>> + described above, but has little applicability outside of that.
>> + Because of this narrow focus, in addition to requiring an
>> + up-to-date working copy with no mixed-revisions, it will not
>> + function in combination with most of the other
>> + <command>svn merge</command> options. You'll get an error if you
>> + use any non-global options but these: <option>--accept</option>,
>> + <option>--dry-run</option>, <option>--diff3-cmd</option>,
>> + <option>--extensions</option>, or <option>--quiet</option>.
>> + </para>
>
> This is ... just lovely.
>
> --
> C. Michael Pilato <cmpilato at red-bean.com> | http://cmpilato.blogspot.com/
>
> _______________________________________________
> svnbook-dev mailing list
> svnbook-dev at red-bean.com
> http://www.red-bean.com/mailman/listinfo/svnbook-dev
>
More information about the svnbook-dev
mailing list