From owner-freebsd-questions@FreeBSD.ORG Mon Sep 3 19:39:54 2012 Return-Path: Delivered-To: freebsd-questions@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 015B4106564A for ; Mon, 3 Sep 2012 19:39:54 +0000 (UTC) (envelope-from freebsd-questions-local@be-well.ilk.org) Received: from asbnvacz-mailrelay01.megapath.net (asbnvacz-mailrelay01.megapath.net [207.145.128.243]) by mx1.freebsd.org (Postfix) with ESMTP id AEACF8FC12 for ; Mon, 3 Sep 2012 19:39:53 +0000 (UTC) Received: from mail4.sea5.speakeasy.net (mail4.sea5.speakeasy.net [69.17.117.48]) by asbnvacz-mailrelay01.megapath.net (Postfix) with ESMTP id 35B37A701F0 for ; Mon, 3 Sep 2012 15:39:47 -0400 (EDT) Received: (qmail 28425 invoked from network); 3 Sep 2012 19:39:46 -0000 Received: by simscan 1.4.0 ppid: 25120, pid: 19224, t: 0.1869s scanners: clamav: 0.88.2/m:52/d:10739 Received: from unknown (HELO be-well.ilk.org) ([66.92.78.145]) (envelope-sender ) by mail4.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 3 Sep 2012 19:39:46 -0000 Received: from lowell-desk.lan (lowell-desk.lan [172.30.250.8]) by be-well.ilk.org (Postfix) with ESMTP id E9DE333C23; Mon, 3 Sep 2012 15:39:39 -0400 (EDT) Received: by lowell-desk.lan (Postfix, from userid 1147) id 4E76C3983C; Mon, 3 Sep 2012 15:39:39 -0400 (EDT) From: Lowell Gilbert To: Darrel References: <44ehmj1354.fsf@lowell-desk.lan> <5044DC50.7020806@FreeBSD.org> Date: Mon, 03 Sep 2012 15:39:39 -0400 In-Reply-To: (Darrel's message of "Mon, 3 Sep 2012 14:00:47 -0400 (EDT)") Message-ID: <44k3wazyis.fsf@lowell-desk.lan> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: Lowell Gilbert , Matthew Seaman , freebsd-questions@FreeBSD.org Subject: Re: [solved]: to move csup 90 to subversion 91rc 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: Mon, 03 Sep 2012 19:39:54 -0000 Darrel writes: >>>> For ports would it be better to match -fbsd91, like this: >>>> svn co http://svn.freebsd.org/ports/releng/9.1 ports >> >> >> On 03/09/2012 17:29, Lowell Gilbert wrote: >>> I'm not sure whether there's any equivalent to tracking RELENG_9 (as >>> opposed to tracking RELENG_9_1) under the branching scheme being used >>> with subversion. >> >> stable/9 is the SVN equivalent of RELENG_9 >> >> > > Could I then run: > > svn co svn://svn.freebsd.org/ports/releng/[ 91 9.1] /usr/ports/ > > or | and > > svn co svn://svn.freebsd.org/ports/stable/9 /usr/ports/ ? No. > Since in the past several years I installed minimal fbsd and then used > portsnap for ports, so I was not aware that -head was the only option > for ports- is that what Lowell was pointing out? Yes. There is never any branching in the ports tree. The latest (i.e., head) version is, at any given time, expected to work for all (then) supported versions of the base system. This is not a change -- this has always been the case, and the current (cvsup-centric) text in the Handbook describes it explicitly. > It turns out that mergemaster would have been alright in my case, due > to .mergemasterrc, I can not recall why this was selected, comments > are welcomed: > > # cat .mergemasterrc > FREEBSD_ID=YES Equivalent to -F. > VERBOSE=YES > AUTO_INSTALL=YES > RUN_UPDATES=YES > COMP_CONFS=YES > PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S` > DELETE_STALE_RC_FILES=YES A reasonable set of defaults, although I prefer a little more human interaction on major changes. Why it "would have been alright(sic)" in your case isn't clear, because you don't describe the alternative, but the manual for mergemaster(8) almost certainly has the answer.