From owner-freebsd-questions@FreeBSD.ORG Thu Sep 27 06:25:13 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 DF333106564A for ; Thu, 27 Sep 2012 06:25:12 +0000 (UTC) (envelope-from trond@fagskolen.gjovik.no) Received: from smtp.fagskolen.gjovik.no (smtp.fagskolen.gjovik.no [IPv6:2001:700:1100:1:200:ff:fe00:b]) by mx1.freebsd.org (Postfix) with ESMTP id 601688FC08 for ; Thu, 27 Sep 2012 06:25:12 +0000 (UTC) Received: from mail.fig.ol.no (localhost [127.0.0.1]) by mail.fig.ol.no (8.14.5/8.14.5) with ESMTP id q8R6P6hF084848 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 27 Sep 2012 08:25:06 +0200 (CEST) (envelope-from trond@fagskolen.gjovik.no) Received: from localhost (trond@localhost) by mail.fig.ol.no (8.14.5/8.14.5/Submit) with ESMTP id q8R6P5BX084845; Thu, 27 Sep 2012 08:25:06 +0200 (CEST) (envelope-from trond@fagskolen.gjovik.no) X-Authentication-Warning: mail.fig.ol.no: trond owned process doing -bs Date: Thu, 27 Sep 2012 08:25:05 +0200 (CEST) From: =?ISO-8859-1?Q?Trond_Endrest=F8l?= Sender: Trond.Endrestol@fagskolen.gjovik.no To: Ed Flecko In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) Organization: Fagskolen Innlandet OpenPGP: url=http://fig.ol.no/~trond/trond.key MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="2055831798-864707079-1348727106=:60743" X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.fig.ol.no 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 06:25:13 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --2055831798-864707079-1348727106=:60743 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT On Wed, 26 Sep 2012 14:12-0700, Ed Flecko wrote: > I see that CVS is being phased out in favor of subversion. > > I follow the documentation to keep my system up to date by doing: > > # cd /usr/src > # make buildworld > # make buildkernel > # make installkernel > # shutdown -r now > > and then... > > # mount -u / > # mount -a -t ufs > # adjkerntz -i > # mergemaster -p > # cd /usr/src > # make installworld > # mergemaster > # reboot > > I've "pre-populated" my /usr/ports, /usr/src and /usr/src/sys > directories when I installed my system. > > I've installed subversion from package, I want to follow the Stable > (same as "Patch", right?) branch, and I'm struggling how to best use > subversion to update my kernel source, system files, documentation, > etc., so I can keep my system up to date. > > Can someone tell me how to use subversion to keep my /usr/ports, > /usr/src and /usr/src/sys directories up to date? This isn't really an answer to your question. I switched from CVSup to Subversion for tracking base/stable/9 and ports/head on one of my computers not long ago. I still use local CVS for tracking my local changes. It works quite well without interfering with each other. Also, CVS is very lightweight, in more than one sense, compared to Subversion. 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. Depending on your needs, you might wanna set up a local Subversion repo mirror. Here's my writeup on the subject: http://ximalas.info/2012/09/09/making-your-own-freebsd-subversion-repository-mirror/ -- +-------------------------------+------------------------------------+ | Vennlig hilsen, | Best regards, | | Trond Endrestøl, | Trond Endrestøl, | | IT-ansvarlig, | System administrator, | | Fagskolen Innlandet, | Gjøvik Technical College, Norway, | | tlf. mob. 952 62 567, | Cellular...: +47 952 62 567, | | sentralbord 61 14 54 00. | Switchboard: +47 61 14 54 00. | +-------------------------------+------------------------------------+ --2055831798-864707079-1348727106=:60743--