From owner-freebsd-questions@FreeBSD.ORG Fri Sep 28 12:11:09 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 686B1106566C for ; Fri, 28 Sep 2012 12:11:09 +0000 (UTC) (envelope-from jamie@kode5.net) Received: from kontrol.kode5.net (kontrol.kode5.net [80.229.5.32]) by mx1.freebsd.org (Postfix) with ESMTP id C7E0A8FC19 for ; Fri, 28 Sep 2012 12:11:08 +0000 (UTC) Received: from kontrol.kode5.net (localhost [127.0.0.1]) by kontrol.kode5.net (8.14.5/8.14.5) with ESMTP id q8SCB7ZJ010494 for ; Fri, 28 Sep 2012 13:11:07 +0100 (BST) (envelope-from jamie@kode5.net) Received: (from jamie@localhost) by kontrol.kode5.net (8.14.5/8.14.5/Submit) id q8SCB61G010493 for freebsd-questions@freebsd.org; Fri, 28 Sep 2012 13:11:06 +0100 (BST) (envelope-from jamie@kode5.net) X-Authentication-Warning: kontrol.kode5.net: jamie set sender to jamie@kode5.net using -f Date: Fri, 28 Sep 2012 13:11:06 +0100 From: Jamie Paul Griffin To: freebsd-questions@freebsd.org Message-ID: <20120928121106.GG2389@kontrol.kode5.net> Mail-Followup-To: freebsd-questions@freebsd.org References: <20120927001135.8e893552.freebsd@edvax.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: x-operating-system: FreeBSD 9.1-PRERELEASE amd64 x-pgp-fingerprint: A4B9 E875 A18C 6E11 F46D B788 BEE6 1251 1D31 DC38 x-pgp-key: 1D31DC38 User-Agent: Mutt/1.5.21 (2010-09-15) X-Virus-Scanned: clamav-milter 0.97.6 at kontrol.kode5.net X-Virus-Status: Clean 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: Fri, 28 Sep 2012 12:11:09 -0000 [ Warren Block wrote on Thu 27.Sep'12 at 14:11:39 -0600 ] > Yes. If a new version of a file conflicts with your local changes, svn > will complain and try to help resolve those conflicts. When I changed to svn, I completely remove or moved (mv(1)) the /usr/ports tree. Created a new /usr/ports and then used svn to pull in the collection. The same for the base course tree in /usr/src. It's my understanding you need to do that first. You can't use a mixed file system tree comprising cvs/csup and svn files. I'm sure Some will correct that if i'm wrong, but that's what I did and i've experienced no problems with it. The only noticeable difference is when updating my ports collection with svn, it's slower to update than say portsnap or cvs/csup. But it's not a major issue for me.