From owner-freebsd-current@FreeBSD.ORG Wed Mar 25 21:02:13 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 7CD27106566B for ; Wed, 25 Mar 2009 21:02:13 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 0CA2E8FC15 for ; Wed, 25 Mar 2009 21:02:12 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 11423 invoked by uid 399); 25 Mar 2009 21:02:10 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 25 Mar 2009 21:02:10 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49CA9BD0.70205@FreeBSD.org> Date: Wed, 25 Mar 2009 14:02:08 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.21 (X11/20090321) MIME-Version: 1.0 To: Andreas Tobler References: <49C16ECD.1040901@FreeBSD.org> <49CA90BA.5090004@fgznet.ch> <49CA968A.5070403@FreeBSD.org> <49CA9A21.3090302@fgznet.ch> In-Reply-To: <49CA9A21.3090302@fgznet.ch> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 21:02:13 -0000 Andreas Tobler wrote: > 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. You're not using the devel/subversion-freebsd port. > This how I co'ed the repo: > > svn checkout svn://svn.freebsd.org/base/head src I just tested that with the subversion-freebsd version, and it worked just fine. > 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. I'm glad you're happy now, but you won't be when you do your next mergemaster run. :) Mergemaster counts on there being a real version number in the VCS Id string to compare against and learn about new versions of files. If the files in your base and the files in the src tree all have identical strings (i.e., they are all equal to $FreeBSD$) then mergemaster will never know that there is a new version available. hth, Doug