[PATCH] stylistic changes
Larry Shatzer, Jr.
larrys at gmail.com
Tue May 26 10:56:29 CDT 2009
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
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.
Attached is a separate patch to put the double space behind "?". I
could not find any "!" that needed it, unless I missed one.
* src/en/book/ch02-basic-usage.xml Use double spaces after sentence boundaries.
-------------- next part --------------
--- src/en/book/ch02-basic-usage.xml (revision 3524)
+++ src/en/book/ch02-basic-usage.xml (working copy)
@@ -2296,7 +2296,7 @@
<para>But what happens if your collaborators move or delete a file
- that you are still working on? Maybe there was a miscommunication,
+ that you are still working on? Maybe there was a miscommunication,
and one person thinks the file should be deleted, while another
person still wants to commit changes to the file. Or maybe your
collaborators did some refactoring, renaming files and moving
@@ -2517,7 +2517,7 @@
svn: Aborting commit: 'code/bar.c' remains in conflict
- <para>So how can this conflict be resolved? You can either agree
+ <para>So how can this conflict be resolved? You can either agree
or disagree with the move Harry made. In case you agree, you can
delete <filename>bar.c</filename> and mark the tree conflict as
More information about the svnbook-dev