From owner-freebsd-questions@FreeBSD.ORG Wed Sep 26 22:11:43 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 E4F771065674 for ; Wed, 26 Sep 2012 22:11:43 +0000 (UTC) (envelope-from freebsd@edvax.de) Received: from mx01.qsc.de (mx01.qsc.de [213.148.129.14]) by mx1.freebsd.org (Postfix) with ESMTP id A1FF88FC23 for ; Wed, 26 Sep 2012 22:11:43 +0000 (UTC) Received: from r56.edvax.de (port-92-195-214-70.dynamic.qsc.de [92.195.214.70]) by mx01.qsc.de (Postfix) with ESMTP id 5072E3CC4F; Thu, 27 Sep 2012 00:11:36 +0200 (CEST) Received: from r56.edvax.de (localhost [127.0.0.1]) by r56.edvax.de (8.14.5/8.14.5) with SMTP id q8QMBZEI001900; Thu, 27 Sep 2012 00:11:35 +0200 (CEST) (envelope-from freebsd@edvax.de) Date: Thu, 27 Sep 2012 00:11:35 +0200 From: Polytropon To: Ed Flecko Message-Id: <20120927001135.8e893552.freebsd@edvax.de> In-Reply-To: References: Organization: EDVAX X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.5; i386-portbld-freebsd8.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 Reply-To: Polytropon List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 22:11:44 -0000 On Wed, 26 Sep 2012 14:12:34 -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 Compare this again to the comment header of /usr/src/Makefile, but looks valid (even though few "cleanup steps" are missing). > 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. No, -STABLE and -RELEASE-p are different things. While -STABLE is a development branch that has incorporated things that have been considered "stable" on the continuous work toward a new version (that's from -CURRENT), -RELEASE-p only contains security patches for that release: this is what you get when using the binary method of updating, using freebsd-update. The -CURRENT (or -HEAD) is the active devlopment branch from which "good" things are passed to -STABLE. That branch is considered "experimental". If you want to follow the -RELEASE-p way, why not simply use freebsd-update, especially if you're _not_ running a custom kernel (as concluded from your commands example shown above)? > Can someone tell me how to use subversion to keep my /usr/ports, > /usr/src and /usr/src/sys directories up to date? /usr/src and /usr/src/sys are no distinct subtrees, i. e. /usr/src/sys is a component of /usr/src. It's only different from /usr/ports. Using the "old" CVS approach, both can be updated with the same program (csup). -- Polytropon Magdeburg, Germany Happy FreeBSD user since 4.0 Andra moi ennepe, Mousa, ...