Date: Mon, 03 Sep 2012 15:39:39 -0400 From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org> To: Darrel <levitch@iglou.com> Cc: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org>, Matthew Seaman <matthew@FreeBSD.org>, freebsd-questions@FreeBSD.org Subject: Re: [solved]: to move csup 90 to subversion 91rc Message-ID: <44k3wazyis.fsf@lowell-desk.lan> In-Reply-To: <alpine.GSO.2.00.1209031342130.6464@shell1> (Darrel's message of "Mon, 3 Sep 2012 14:00:47 -0400 (EDT)") References: <alpine.GSO.2.00.1209031147260.6464@shell1> <44ehmj1354.fsf@lowell-desk.lan> <5044DC50.7020806@FreeBSD.org> <alpine.GSO.2.00.1209031342130.6464@shell1>
next in thread | previous in thread | raw e-mail | index | archive | help
Darrel <levitch@iglou.com> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44k3wazyis.fsf>