[PATCH] stylistic changes

Larry Shatzer, Jr. larrys at gmail.com
Tue May 26 11:23:54 CDT 2009


On Tue, May 26, 2009 at 10:16 AM, C. Michael Pilato
<cmpilato at red-bean.com> wrote:
> Larry Shatzer, Jr. wrote:
>> On Tue, May 26, 2009 at 9:19 AM, Julian Foad <julianfoad at btopenworld.com> wrote:
>>> Want to do a correction for the "--from-source" option?
>>>
>>
>> I don't feel confident in the mergeinfo subcommand, as I've not gotten
>> the chance to play around with merge tracking as of yet.
>>
>> I do see a mailing list reference to --from-source here:
>> http://svn.haxx.se/dev/archive-2008-03/0886.shtml (and a few others in
>> that thread).
>>
>> Maybe the documentation of that feature happened before implementing
>> it (not very likely). Or it was put in before an official release, and
>> removed, but during that time it was documented, and never removed.
>
> I think we documented 'svn mergeinfo --from-source' after implementing it,
> but before we changed the feature's syntax to have the source included as
> part of the regular commandline arguments, as in 'svn mergeinfo SOURCE
> [TARGET]'.  Regardless, there is not, nor ever was, a --from-source option
> in a *released* version of Subversion.

Which is what I figured. Would this patch be acceptable?

[[[

* src/en/book/ch04-branching-and-merging.xml Remove --from-source

]]]

-- Larry
-------------- next part --------------
Index: src/en/book/ch04-branching-and-merging.xml
===================================================================
--- src/en/book/ch04-branching-and-merging.xml	(revision 3524)
+++ src/en/book/ch04-branching-and-merging.xml	(working copy)
@@ -3172,7 +3172,7 @@
 
           <row>
             <entry>See merge history or eligible changesets</entry>
-            <entry><userinput>svn mergeinfo target --from-source=<replaceable>URL</replaceable></userinput></entry>
+            <entry><userinput>svn mergeinfo <replaceable>SOURCE</replaceable> <replaceable>TARGET</replaceable></userinput></entry>
           </row>
 
           <row>


More information about the svnbook-dev mailing list