Date: Sun, 20 Jul 2014 18:08:19 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45344 - head/en_US.ISO8859-1/books/handbook/mirrors Message-ID: <201407201808.s6KI8JIk085418@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Sun Jul 20 18:08:19 2014 New Revision: 45344 URL: http://svnweb.freebsd.org/changeset/doc/45344 Log: Summarize the warning about svn checkout over existing directories in a one-sentence introduction paragraph. Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Sun Jul 20 16:17:26 2014 (r45343) +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Sun Jul 20 18:08:19 2014 (r45344) @@ -491,9 +491,10 @@ Comment out for now until these can be v 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407201808.s6KI8JIk085418>