From owner-freebsd-current@FreeBSD.ORG  Sat Mar 26 17:31:40 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 2FE011065675
	for <freebsd-current@freebsd.org>; Sat, 26 Mar 2011 17:31:40 +0000 (UTC)
	(envelope-from nlandys@gmail.com)
Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com
	[209.85.214.182])
	by mx1.freebsd.org (Postfix) with ESMTP id DBB408FC14
	for <freebsd-current@freebsd.org>; Sat, 26 Mar 2011 17:31:39 +0000 (UTC)
Received: by iwn33 with SMTP id 33so2644864iwn.13
	for <multiple recipients>; Sat, 26 Mar 2011 10:31:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:in-reply-to:references:date
	:message-id:subject:from:to:cc:content-type;
	bh=xatJ8S9kr9YBsV/LIgb3pssZRalLLhwtFXT7zW3uL9M=;
	b=UAwzUd7X8ebhrt7PntCS80w5URcwlEqi2mX7tgpRpwzcf7ih4yX0bCKAXJ3cjaz9ny
	MXkXvtYrcKkwY60gMy7Q/V39eQSKxz5S1oFvtCTNmdUgQLKXqOTV3y9dupZ6Pvaa4Qo7
	aY5SwrYwTs3W0l4n25iborwp7/dAvfu7uWKVg=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type;
	b=Emogqz5XtPMXMEccvzVDHP8IO8vaZdr3/k6oxU996NmAlyPx9bWkgV5cImkE9+YaZM
	adG3a94Ao/+eFpBVmEgfCHpJ/LmYKFK49fbc3OZuNRb3a3fHHw1mfnrn+PglXTHp9t37
	Qyr2Dm/cl+z31oQC9MoaW3Ku/hcbCmcEzTiHw=
MIME-Version: 1.0
Received: by 10.43.64.18 with SMTP id xg18mr3217788icb.144.1301160699135; Sat,
	26 Mar 2011 10:31:39 -0700 (PDT)
Received: by 10.42.227.66 with HTTP; Sat, 26 Mar 2011 10:31:39 -0700 (PDT)
In-Reply-To: <20110326110012.GA73916@freebsd.org>
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>
Date: Sat, 26 Mar 2011 10:31:39 -0700
Message-ID: <AANLkTinoEJFdugT86v-vVjkh_gcVN1OFxM4h-H0gXW_p@mail.gmail.com>
From: Nerius Landys <nlandys@gmail.com>
To: Alexander Best <arundel@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: Garrett Cooper <yanegomi@gmail.com>, 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 17:31:40 -0000

> 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/?