From owner-freebsd-current@FreeBSD.ORG Wed Mar 25 20:39:42 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 3C30210656C5 for ; Wed, 25 Mar 2009 20:39:42 +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 C2FA08FC19 for ; Wed, 25 Mar 2009 20:39:41 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 10443 invoked by uid 399); 25 Mar 2009 20:39:40 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 25 Mar 2009 20:39:40 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49CA968A.5070403@FreeBSD.org> Date: Wed, 25 Mar 2009 13:39:38 -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> In-Reply-To: <49CA90BA.5090004@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 20:39:45 -0000 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 $ Assuming you've run mergemaster on this installation previously you could use the -U option to install new files that you haven't modified. hth, Doug > This is what I get here: > > ---- > *** Displaying differences between ./etc/pam.d/ftpd and installed version: > > --- /etc/pam.d/ftpd 2009-01-03 23:32:10.000000000 +0100 > +++ ./etc/pam.d/ftpd 2009-03-25 22:00:53.000000000 +0100 > @@ -1,5 +1,5 @@ > # > -# $FreeBSD: src/etc/pam.d/ftpd,v 1.19.6.1 2008/11/25 02:59:29 kensmith > Exp $ > +# $FreeBSD$ > # > # PAM configuration for the "ftpd" service > # > > Use 'd' to delete the temporary ./etc/pam.d/ftpd > Use 'i' to install the temporary ./etc/pam.d/ftpd > Use 'm' to merge the temporary and installed versions > Use 'v' to view the diff results again > ---- > > > TIA, > Andreas > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > -- This .signature sanitized for your protection