From owner-freebsd-questions@FreeBSD.ORG Thu Sep 27 20:23:35 2012 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E7E90106564A for ; Thu, 27 Sep 2012 20:23:35 +0000 (UTC) (envelope-from wblock@wonkity.com) Received: from wonkity.com (wonkity.com [67.158.26.137]) by mx1.freebsd.org (Postfix) with ESMTP id 5A1C68FC16 for ; Thu, 27 Sep 2012 20:23:35 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.5/8.14.5) with ESMTP id q8RKBdpc090848; Thu, 27 Sep 2012 14:11:39 -0600 (MDT) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id q8RKBdKs090845; Thu, 27 Sep 2012 14:11:39 -0600 (MDT) (envelope-from wblock@wonkity.com) Date: Thu, 27 Sep 2012 14:11:39 -0600 (MDT) From: Warren Block To: Ed Flecko In-Reply-To: Message-ID: References: <20120927001135.8e893552.freebsd@edvax.de> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (wonkity.com [127.0.0.1]); Thu, 27 Sep 2012 14:11:40 -0600 (MDT) Cc: freebsd-questions@freebsd.org Subject: Re: How to use subversion to keep source, system and doc files up to date? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 20:23:36 -0000 On Thu, 27 Sep 2012, Ed Flecko wrote: > Thank you all! > > I'm a little confused by Trond's reply, > > "Make sure your /usr/src and /usr/ports directories does not contain > files and directories served by Subversion, they will hinder > extraction/updating when checking out a Subversion working copy on top > of the existing hierarchy. > > Simply delete all non-local files, rename /usr/src/sys to, say > /usr/src/sys0, do the Subversion check out, and move your local files > back into place." > > 1.) What is meant by deleting all non-local files? What files is he > referring to? If you have made any local changes to files in /usr/src or /usr/ports, those changes will conflict with the versions svn will bring in. > 2.) If I rename /usr/src/sys to, say /usr/src/sys0, do the Subversion > check out, and move your local files back into place, won't that be > replacing new files with the older files? Yes, although svn will only care if those files differ from the files in the repository. Most people won't have any local changes anyway. > 3.) These steps are just meant for the initial check out, aren't > they??? Once I've checked out (i.e., "downloaded", right?) the current > files, I'll only need to: svn update /usr/ports..., etc. from that > point forward and not "delete all non-local files, rename /usr/src/sys > to, say /usr/src/sys0, do the Subversion check out, and move your > local files back into place"...Is that right? Yes. If a new version of a file conflicts with your local changes, svn will complain and try to help resolve those conflicts.