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
Received on Wed Mar 12 03:44:57 2003