From owner-freebsd-current@FreeBSD.ORG  Sat Mar 26 20:12:07 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55C5F106564A
	for <freebsd-current@freebsd.org>; Sat, 26 Mar 2011 20:12:07 +0000 (UTC)
	(envelope-from erikt@midgard.homeip.net)
Received: from ch-smtp04.sth.basefarm.net (ch-smtp04.sth.basefarm.net
	[80.76.153.5]) by mx1.freebsd.org (Postfix) with ESMTP id D60548FC15
	for <freebsd-current@freebsd.org>; Sat, 26 Mar 2011 20:12:06 +0000 (UTC)
Received: from c83-255-51-20.bredband.comhem.se ([83.255.51.20]:53715
	helo=falcon.midgard.homeip.net)
	by ch-smtp04.sth.basefarm.net with esmtp (Exim 4.73)
	(envelope-from <erikt@midgard.homeip.net>) id 1Q3ZbJ-0003yZ-Fd
	for freebsd-current@freebsd.org; Sat, 26 Mar 2011 20:56:48 +0100
Received: (qmail 9315 invoked from network); 26 Mar 2011 20:56:45 +0100
Received: from owl.midgard.homeip.net (10.1.5.7)
	by falcon.midgard.homeip.net with ESMTP; 26 Mar 2011 20:56:45 +0100
Received: (qmail 31046 invoked by uid 1001); 26 Mar 2011 20:56:45 +0100
Date: Sat, 26 Mar 2011 20:56:45 +0100
From: Erik Trulsson <ertr1013@student.uu.se>
To: Nerius Landys <nlandys@gmail.com>
Message-ID: <20110326195644.GA31016@owl.midgard.homeip.net>
References: <AANLkTik+KcxpO47JH8z-ezTJD3ZH-ozJSp1xfgRYpWNs@mail.gmail.com>
	<20110325233826.00000cab@unknown>
	<AA26C490-6CCD-4EF1-9874-28534982DDA2@gmail.com>
	<AANLkTikq_yoeh4DtOV5wShZ0YqA1goNEbkttP2i1EQbF@mail.gmail.com>
	<BANLkTim5=V6sFV_a2xc2dTSOt_kDfGuYoA@mail.gmail.com>
	<20110326110012.GA73916@freebsd.org>
	<AANLkTinoEJFdugT86v-vVjkh_gcVN1OFxM4h-H0gXW_p@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <AANLkTinoEJFdugT86v-vVjkh_gcVN1OFxM4h-H0gXW_p@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Originating-IP: 83.255.51.20
X-Scan-Result: No virus found in message 1Q3ZbJ-0003yZ-Fd.
X-Scan-Signature: ch-smtp04.sth.basefarm.net 1Q3ZbJ-0003yZ-Fd
	bb947b11903c76c14343e1407acebd0f
Cc: Garrett Cooper <yanegomi@gmail.com>, Alexander Best <arundel@freebsd.org>,
	Bruce Cran <bruce@cran.org.uk>, freebsd-current@freebsd.org,
	Artem Belevich <fbsdlist@src.cx>
Subject: Re: Getting /usr/src/ from SVN directly?
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Mar 2011 20:12:07 -0000

On Sat, Mar 26, 2011 at 10:31:39AM -0700, Nerius Landys wrote:
> > one could also use the -F switch in connection with mergemaster(8).
> 
> >From mergemaster manpage:
> 
> "If the files differ only by VCS Id ($FreeBSD) install the new file."
> 
> Yes that is exactly what I want, thanks.
> 
> By the way, are there any other ways that are more preferred to get
> /usr/src/ than doing what I've done, which is using
> devel/subversion-freebsd to checkout head into /usr/src/?

No, that is probably the best way.

An older method (which still works) is to use csup/cvsup to download a
local copy of the whole CVS repository and then use cvs to checkout
/usr/src from this copy.
Before the switch to subversion this was the preferred way.




-- 
<Insert your favourite quote here.>
Erik Trulsson
ertr1013@student.uu.se