From owner-freebsd-current@FreeBSD.ORG Wed Mar 25 20:14:54 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 9AE311065676 for ; Wed, 25 Mar 2009 20:14:54 +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 36F088FC15 for ; Wed, 25 Mar 2009 20:14:53 +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 n2PKEo3C086949; Wed, 25 Mar 2009 21:14:51 +0100 (CET) (envelope-from andreast-list@fgznet.ch) Message-ID: <49CA90BA.5090004@fgznet.ch> Date: Wed, 25 Mar 2009 21:14:50 +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> In-Reply-To: <49C16ECD.1040901@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:14:55 -0000 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? Or does this only work when the cvs version differs? I'm updating right now a 7.1 install on ppc to a current, svn based build, from today. 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