From owner-freebsd-current@FreeBSD.ORG Sat Mar 26 03:43:51 2011 Return-Path: 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 96E76106566C for ; Sat, 26 Mar 2011 03:43:51 +0000 (UTC) (envelope-from artemb@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id C36038FC18 for ; Sat, 26 Mar 2011 03:43:50 +0000 (UTC) Received: by qwc9 with SMTP id 9so1112099qwc.13 for ; Fri, 25 Mar 2011 20:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=nfTjWOQOMUq7U4nNR9g0yH4KRH4R3w4O4qSJfxuSFC0=; b=C7f9ZncosmIsHcqODCfOCRsRO03AYUhMCwmCC//saUMQ4UWr7qt0jh7xEcAYkKcty6 B/DZ5i/6QGm0e4KOxYWZz6lQ8s115/oyBDNHYJyxNucZYhhAbI4otdww0W1BD/RFyCFv w8lOzR2FO9WfEPhNXuU+pBf+Upkf3fOD0DQms= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=xYwOEmgB7xLZbOI7mXeUNnz4c5WFlUYT/PxGfaYbT/QRjv6gECjATm5fLxh72mifQ5 GcPC+z+7BvBz0leWh0RBk/0ngHZxHK6IWUBsDwA8eJ8zAzcGyBpiwkTgXrsQy19qTm4B tqKQIc6chBHjglIqnd21NCUKZoNBPCsrK5Qwg= MIME-Version: 1.0 Received: by 10.229.0.202 with SMTP id 10mr1271893qcc.173.1301109137088; Fri, 25 Mar 2011 20:12:17 -0700 (PDT) Sender: artemb@gmail.com Received: by 10.229.31.83 with HTTP; Fri, 25 Mar 2011 20:12:17 -0700 (PDT) In-Reply-To: References: <20110325233826.00000cab@unknown> Date: Fri, 25 Mar 2011 20:12:17 -0700 X-Google-Sender-Auth: zGQQO3Uo8AL1QBMFkaiJMCrDX4Q Message-ID: From: Artem Belevich To: Nerius Landys Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Garrett Cooper , Bruce Cran , 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2011 03:43:51 -0000 --Artem On Fri, Mar 25, 2011 at 8:05 PM, Nerius Landys wrote: >> Use devel/subversion-freebsd though so it expands the $FreeBSD$ RCS tag. > > I just did that. =A0I am afraid however that all of my files in /etc > will have a different RCS tag. =A0For 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? =A0Is 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]? I have following line in my /etc/mergemaster.rc that tells mergemaster to ignore $FreeBSD$ keywords altogether. DIFF_OPTIONS=3D'-I$FreeBSD.*[$]' --Artem