From owner-cvs-src-old@FreeBSD.ORG  Wed May 11 17:12:35 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 784D9106566B
	for <cvs-src-old@freebsd.org>; Wed, 11 May 2011 17:12:35 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D8958FC0C
	for <cvs-src-old@freebsd.org>; Wed, 11 May 2011 17:12:35 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p4BHCZoJ068823
	for <cvs-src-old@freebsd.org>; Wed, 11 May 2011 17:12:35 GMT
	(envelope-from cperciva@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p4BHCZfA068822
	for cvs-src-old@freebsd.org; Wed, 11 May 2011 17:12:35 GMT
	(envelope-from cperciva@repoman.freebsd.org)
Message-Id: <201105111712.p4BHCZfA068822@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	cperciva@repoman.freebsd.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 11 May 2011 15:23:27 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/freebsd-update freebsd-update.sh
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2011 17:12:35 -0000

cperciva    2011-05-11 15:23:27 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/freebsd-update freebsd-update.sh 
  Log:
  SVN rev 221780 on 2011-05-11 15:23:27Z by cperciva
  
  Make freebsd-update(8) smarter in how it handles $FreeBSD$ tags in
  configuration files.
  
  If the current file differs from the canonical version from the old release
  only due to differences in the $FreeBSD$ tag (which can happen if the system
  was installed from source code, depending on how the src tree was checked out)
  then freebsd-update will treat the file as "unmodified" and silently update
  it to the "clean" version in the new release.
  
  If the only change being made to a configuration file is in the $FreeBSD$
  tag (e.g., for any configuration files which have been modified locally, now
  that we're using SVN and the $FreeBSD$ tag changes when a branch is created),
  freebsd-update will no longer print the diff and prompt "Does this look
  reasonable (y/n)?".
  
  Nagged by:      pgollucci
  MFC after:      1 month
  
  Revision  Changes    Path
  1.25      +33 -3     src/usr.sbin/freebsd-update/freebsd-update.sh