You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Brian Denny <br...@briandenny.net> on 2003/03/12 02:39:49 UTC
[PATCH] tiny book fix
I understand that chapter six is due for 'mass rewriting', but FWIW...
Log:
Fix a typo and an incorrect usage of 'svn merge'.
Index: doc/book/book/ch06.xml
===================================================================
--- doc/book/book/ch06.xml (revision 5283)
+++ doc/book/book/ch06.xml (working copy)
@@ -164,7 +164,7 @@
<para>The per-user INI files</para>
</listitem>
<listitem>
- <para>The pre-user Registry values</para>
+ <para>The per-user Registry values</para>
</listitem>
<listitem>
<para>The system-wide INI files</para>
@@ -1730,7 +1730,7 @@
$ cd working-copies/calc
$ svn merge http://svn.example.com/repos/vendor/libcomplex/1.0 \
http://svn.example.com/repos/vendor/libcomplex/current \
- http://svn.example.com/repos/calc/libcomplex
+ libcomplex
… # resolve all the conflicts between their changes and our changes
$ svn commit -m 'merging libcomplex-1.1 into the main branch'
…
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] tiny book fix
Posted by Brian Denny <br...@briandenny.net>.
On Tue, Mar 11, 2003 at 08:02:58PM -0800, Matt Kraai wrote:
>
> Committed, thanks. In the future, please follow the log message
> guidelines.
'k.
i was actually aware of the HACKING guidelines and chose the format
i did because i'd seen some commits under doc/book with a briefer format
(e.g. 'svn log -r5110:5113') and thought maybe a different convention
was in place for book edits.
but next time i will do as the good HACKING document says.
:) brian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] tiny book fix
Posted by Matt Kraai <kr...@alumni.cmu.edu>.
On Tue, Mar 11, 2003 at 06:39:49PM -0800, Brian Denny wrote:
> I understand that chapter six is due for 'mass rewriting', but FWIW...
Committed, thanks. In the future, please follow the log message
guidelines.
Matt
--
Oink!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org