From owner-svn-src-head@FreeBSD.ORG  Sat May 23 16:13:52 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 223461065677;
	Sat, 23 May 2009 16:13:52 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D2998FC1B;
	Sat, 23 May 2009 16:13:49 +0000 (UTC) (envelope-from des@des.no)
Received: from ds4.des.no (cm-84.215.252.34.getinternet.no [84.215.252.34])
	by smtp.des.no (Postfix) with ESMTP id 5AA766D41C;
	Sat, 23 May 2009 18:13:48 +0200 (CEST)
Received: by ds4.des.no (Postfix, from userid 1001)
	id 5365E84498; Sat, 23 May 2009 18:13:48 +0200 (CEST)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Robert Watson <rwatson@FreeBSD.org>
References: <200905231600.n4NG0G78059747@svn.freebsd.org>
	<alpine.BSF.2.00.0905231708290.75344@fledge.watson.org>
Date: Sat, 23 May 2009 18:13:48 +0200
In-Reply-To: <alpine.BSF.2.00.0905231708290.75344@fledge.watson.org> (Robert
	Watson's message of "Sat, 23 May 2009 17:09:30 +0100 (BST)")
Message-ID: <863aavyeyr.fsf@ds4.des.no>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r192639 - head/sys/cddl/boot/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 May 2009 16:13:52 -0000

Robert Watson <rwatson@FreeBSD.org> writes:
> "Dag-Erling Sm=C3=B8rgrav" <des@des.no> writes:
> >  Remove svn:keywords on a file that had fbsd:nokeywords (though I don't
> >  understand the reason for the latter)
> This seems backwards, as does the commit that followed it to remove
> the expanded $FreeBSD$ string.

I just restored the file to the state it was in before I started messing
with it yesterday.

> Is there any reason this file shouldn't have an ID string?  Or rather,
> is there any reason to have an unexpanded one as opposed to none, or
> an expanded one?

Not that I know of, but when I became aware of the conflict, the easiest
way out was to revert my change.

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no