aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/books/handbook/mirrors
diff options
context:
space:
mode:
authorWarren Block <wblock@FreeBSD.org>2014-07-20 18:08:19 +0000
committerWarren Block <wblock@FreeBSD.org>2014-07-20 18:08:19 +0000
commitab8d89cf2704ff3413fcd7e4515b3db27e276e74 (patch)
treeed5c2297226a0848c3d40fa0d7590e71dab0a647 /en_US.ISO8859-1/books/handbook/mirrors
parent6fab224f056fb6a05990f1deb68d90ff07a96493 (diff)
downloaddoc-ab8d89cf2704ff3413fcd7e4515b3db27e276e74.tar.gz
doc-ab8d89cf2704ff3413fcd7e4515b3db27e276e74.zip
Summarize the warning about svn checkout over existing directories in a
one-sentence introduction paragraph.
Notes
Notes: svn path=/head/; revision=45344
Diffstat (limited to 'en_US.ISO8859-1/books/handbook/mirrors')
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index e2735c601f..2dd8181a5d 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -491,9 +491,10 @@ Comment out for now until these can be verified.
copy</emphasis>.</para>
<warning>
- <para>If the local directory already exists but was not
- created by <command>svn</command>, rename or delete it
- before the checkout. Checkout over an existing
+ <para><emphasis>Move or delete the local directory before
+ using <command>checkout</command>.</emphasis></para>
+
+ <para>Checkout over an existing
non-<command>svn</command> directory can cause conflicts
between the existing files and those brought in from the
repository.</para>