From owner-freebsd-current@FreeBSD.ORG  Sat Mar 26 03:06:22 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 54B84106564A
	for <freebsd-current@freebsd.org>; Sat, 26 Mar 2011 03:06:22 +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 1D9878FC16
	for <freebsd-current@freebsd.org>; Sat, 26 Mar 2011 03:06:21 +0000 (UTC)
Received: by iwn33 with SMTP id 33so2099526iwn.13
	for <freebsd-current@freebsd.org>; Fri, 25 Mar 2011 20:06:21 -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=Qij+QfPJXu2FChqBKwMJ0UW5zEcpdcr0Of/gIi2Fv3Y=;
	b=Vld5LP3oTq5som0GSrpRywRMyLxFPTmYnZWB2nNqP3fAEr1H9jFhVFLZ816SXhKDYo
	pn3zTp7flGJNGWAPN9V175uPGSlS3yoB8n9TO3y0piTv5IPz2qqA22TooCTVT3Iwm381
	RS+y5rnVQMg5S0TCIE9ImnT0e03lUnVwc298Q=
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=vCw1q/j45/yMhfBSe4BRuyf7qGXpmnmZXbf7lXoXk50+YZ8ZySyyhVGrF2N8bCRWii
	hXFKHfB+r+qiid+Phr0CqQIdWl/rInPF/NLiygXDsXVfISHw6tchw4lJiBA13Eyw7uMt
	MpZtx8Yrr+jaQMFgLUqlNSNxkcqcUnj7uTt9A=
MIME-Version: 1.0
Received: by 10.42.75.6 with SMTP id y6mr2660219icj.10.1301108753564; Fri, 25
	Mar 2011 20:05:53 -0700 (PDT)
Received: by 10.42.227.66 with HTTP; Fri, 25 Mar 2011 20:05:53 -0700 (PDT)
In-Reply-To: <AA26C490-6CCD-4EF1-9874-28534982DDA2@gmail.com>
References: <AANLkTik+KcxpO47JH8z-ezTJD3ZH-ozJSp1xfgRYpWNs@mail.gmail.com>
	<20110325233826.00000cab@unknown>
	<AA26C490-6CCD-4EF1-9874-28534982DDA2@gmail.com>
Date: Fri, 25 Mar 2011 20:05:53 -0700
Message-ID: <AANLkTikq_yoeh4DtOV5wShZ0YqA1goNEbkttP2i1EQbF@mail.gmail.com>
From: Nerius Landys <nlandys@gmail.com>
To: Garrett Cooper <yanegomi@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Cc: Bruce Cran <bruce@cran.org.uk>, freebsd-current@freebsd.org
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 03:06:22 -0000

> Use devel/subversion-freebsd though so it expands the $FreeBSD$ RCS tag.

I just did that.  I am afraid however that all of my files in /etc
will have a different RCS tag.  For example, I got /usr/src/ via SVN
directly (head, or CURRENT) and did a mergemaster prebuildworld step,
and I get this diff in /etc/group:

-# $FreeBSD: src/etc/group,v 1.36 2011/01/28 22:28:12 pjd Exp $
+# $FreeBSD: head/etc/group 218046 2011-01-28 22:28:12Z pjd $

Is there any way that these diffs can be avoided?  Is the only real
solution to just go through mergemaster file-by-file and install all
of the new ones [even though they differ only in this tag]?