From owner-svn-doc-all@FreeBSD.ORG Sun Jul 20 18:08:19 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EAEB2DB3; Sun, 20 Jul 2014 18:08:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7D3C2C40; Sun, 20 Jul 2014 18:08:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6KI8JxZ085419; Sun, 20 Jul 2014 18:08:19 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6KI8JIk085418; Sun, 20 Jul 2014 18:08:19 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201407201808.s6KI8JIk085418@svn.freebsd.org> From: Warren Block Date: Sun, 20 Jul 2014 18:08:19 +0000 (UTC) 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 X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2014 18:08:20 -0000 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. - If the local directory already exists but was not - created by svn, rename or delete it - before the checkout. Checkout over an existing + Move or delete the local directory before + using checkout. + + Checkout over an existing non-svn directory can cause conflicts between the existing files and those brought in from the repository.