From owner-freebsd-current@FreeBSD.ORG Wed Mar 25 20:55:01 2009 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 0B151106566C; Wed, 25 Mar 2009 20:55:01 +0000 (UTC) (envelope-from andreast-list@fgznet.ch) Received: from smtp.fgznet.ch (mail.fgznet.ch [81.92.96.47]) by mx1.freebsd.org (Postfix) with ESMTP id 97EB58FC0C; Wed, 25 Mar 2009 20:54:59 +0000 (UTC) (envelope-from andreast-list@fgznet.ch) Received: from wolfram.andreas.nets ([91.190.8.131]) by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id n2PKsvEO049122; Wed, 25 Mar 2009 21:54:58 +0100 (CET) (envelope-from andreast-list@fgznet.ch) Message-ID: <49CA9A21.3090302@fgznet.ch> Date: Wed, 25 Mar 2009 21:54:57 +0100 From: Andreas Tobler User-Agent: Thunderbird 2.0.0.19 (Macintosh/20081209) MIME-Version: 1.0 To: Doug Barton References: <49C16ECD.1040901@FreeBSD.org> <49CA90BA.5090004@fgznet.ch> <49CA968A.5070403@FreeBSD.org> In-Reply-To: <49CA968A.5070403@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.64 on 81.92.96.47 Cc: FreeBSD Current Subject: Re: New mergemaster option to install files that differ only by $FreeBSD 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: Wed, 25 Mar 2009 20:55:01 -0000 Doug Barton wrote: > Andreas Tobler wrote: >> Doug Barton wrote: >>> This was already discussed on -stable recently, so I've committed the >>> change in order to get it MFCed prior to the 7.2 code freeze. >>> >>> Would those of you who were concerned about this issue during the last >>> round of discussions please test this new option and report back? >> An understanding question here, should this also work when upgrading >> from cvs based install to an svn based install? > > Yes, assuming that you've checked out the sources properly and > actually have the svn Id string. I'm not sure how you got what you got > there, but when I check out the sources with svn I get something like > this: > > # $FreeBSD: head/etc/pam.d/ftpd 170510 2007-06-10 18:57:20Z yar $ Hm, then it seems to me that I did something 'wrong' when I co'ed the svn repository. I am an anonymous user, aka having no svn account. This how I co'ed the repo: svn checkout svn://svn.freebsd.org/base/head src Doing so gives me a $FreeBSD$ on top of each file w/o a rev id. Do I need something else to be passed to svn co? > Assuming you've run mergemaster on this installation previously you > could use the -U option to install new files that you haven't modified. Well, in my case I did type 'i' many times and now I am happy with a 2 hour install/upgrade cycle from 7.1 to current. Thanks, Andreas